summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@hp.com>2015-09-08 10:38:00 -0700
committerJames E. Blair <jeblair@hp.com>2015-09-08 10:43:52 -0700
commitc98efc9c7decd5404a6b3056b5cf285d6d8afbbf (patch)
tree686d024e33150f0a9214a245f5146a911be1547a
parent605ec41b304fc7f9be8e802f9e6d8e549d168fc4 (diff)
Fix connection tuning on >= trusty
The tuning config file needs a .conf extension. Also, trusty uses mpm_worker_event by default, so support that as well. Change-Id: Ica3a7ceab29f120a24ca93cc5491f5fe8ce9e54a
Notes
Notes (review): Code-Review+1: Clint Adams <clint@gcfm.net> Code-Review+1: Anita Kuno <anteaya@anteaya.info> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+1: venkatamahesh <Venkata.Kotha@infinite.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 08 Sep 2015 18:16:18 +0000 Reviewed-on: https://review.openstack.org/221423 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--files/apache-connection-tuning10
-rw-r--r--manifests/apache.pp8
2 files changed, 14 insertions, 4 deletions
diff --git a/files/apache-connection-tuning b/files/apache-connection-tuning
index f3a2400..7993ec9 100644
--- a/files/apache-connection-tuning
+++ b/files/apache-connection-tuning
@@ -27,3 +27,13 @@
27 MaxClients 2048 27 MaxClients 2048
28 MaxRequestsPerChild 0 28 MaxRequestsPerChild 0
29</IfModule> 29</IfModule>
30<IfModule mpm_worker_event>
31 ServerLimit 64
32 StartServers 3
33 MinSpareThreads 96
34 MaxSpareThreads 192
35 ThreadLimit 64
36 ThreadsPerChild 32
37 MaxClients 2048
38 MaxRequestsPerChild 0
39</IfModule>
diff --git a/manifests/apache.pp b/manifests/apache.pp
index cc2dc45..2a4e887 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -44,7 +44,7 @@ class etherpad_lite::apache (
44 notify => Service['httpd'], 44 notify => Service['httpd'],
45 } 45 }
46 } else { 46 } else {
47 file { '/etc/apache2/conf-available/connection-tuning': 47 file { '/etc/apache2/conf-available/connection-tuning.conf':
48 ensure => present, 48 ensure => present,
49 owner => 'root', 49 owner => 'root',
50 group => 'root', 50 group => 'root',
@@ -52,11 +52,11 @@ class etherpad_lite::apache (
52 source => 'puppet:///modules/etherpad_lite/apache-connection-tuning', 52 source => 'puppet:///modules/etherpad_lite/apache-connection-tuning',
53 } 53 }
54 54
55 file { '/etc/apache2/conf-enabled/connection-tuning': 55 file { '/etc/apache2/conf-enabled/connection-tuning.conf':
56 ensure => link, 56 ensure => link,
57 target => '/etc/apache2/conf-available/connection-tuning', 57 target => '/etc/apache2/conf-available/connection-tuning.conf',
58 notify => Service['httpd'], 58 notify => Service['httpd'],
59 require => File['/etc/apache2/conf-available/connection-tuning'], 59 require => File['/etc/apache2/conf-available/connection-tuning.conf'],
60 } 60 }
61 61
62 httpd_mod { 'proxy_wstunnel': 62 httpd_mod { 'proxy_wstunnel':