Browse Source

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
James E. Blair 3 years ago
parent
commit
c98efc9c7d
2 changed files with 14 additions and 4 deletions
  1. 10
    0
      files/apache-connection-tuning
  2. 4
    4
      manifests/apache.pp

+ 10
- 0
files/apache-connection-tuning View File

@@ -27,3 +27,13 @@
27 27
     MaxClients         2048
28 28
     MaxRequestsPerChild   0
29 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>

+ 4
- 4
manifests/apache.pp View File

@@ -44,7 +44,7 @@ class etherpad_lite::apache (
44 44
       notify => Service['httpd'],
45 45
     }
46 46
   } else {
47
-    file { '/etc/apache2/conf-available/connection-tuning':
47
+    file { '/etc/apache2/conf-available/connection-tuning.conf':
48 48
       ensure => present,
49 49
       owner  => 'root',
50 50
       group  => 'root',
@@ -52,11 +52,11 @@ class etherpad_lite::apache (
52 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 56
       ensure  => link,
57
-      target  => '/etc/apache2/conf-available/connection-tuning',
57
+      target  => '/etc/apache2/conf-available/connection-tuning.conf',
58 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 62
     httpd_mod { 'proxy_wstunnel':

Loading…
Cancel
Save