From c98efc9c7decd5404a6b3056b5cf285d6d8afbbf Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 8 Sep 2015 10:38:00 -0700 Subject: [PATCH] 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 --- files/apache-connection-tuning | 10 ++++++++++ manifests/apache.pp | 8 ++++---- 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 @@ MaxClients 2048 MaxRequestsPerChild 0 + + ServerLimit 64 + StartServers 3 + MinSpareThreads 96 + MaxSpareThreads 192 + ThreadLimit 64 + ThreadsPerChild 32 + MaxClients 2048 + MaxRequestsPerChild 0 + 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 ( notify => Service['httpd'], } } else { - file { '/etc/apache2/conf-available/connection-tuning': + file { '/etc/apache2/conf-available/connection-tuning.conf': ensure => present, owner => 'root', group => 'root', @@ -52,11 +52,11 @@ class etherpad_lite::apache ( source => 'puppet:///modules/etherpad_lite/apache-connection-tuning', } - file { '/etc/apache2/conf-enabled/connection-tuning': + file { '/etc/apache2/conf-enabled/connection-tuning.conf': ensure => link, - target => '/etc/apache2/conf-available/connection-tuning', + target => '/etc/apache2/conf-available/connection-tuning.conf', notify => Service['httpd'], - require => File['/etc/apache2/conf-available/connection-tuning'], + require => File['/etc/apache2/conf-available/connection-tuning.conf'], } httpd_mod { 'proxy_wstunnel':