Merge pull request #116 from genesis/89-apache2-prefork

Apache2 sensible prefork tuning

Author: ericclemmons

provisioning/roles/common/templates/prefork.conf

@@ -7,31 +7,31 @@
 {%- if reserved_memory is defined and reserved_memory.mysql is defined -%}
     {% set _memory_mysql = reserved_memory.mysql %}
 {%- else -%}
-    {% set _memory_mysql = 512 if ansible_memtotal_mb >= 2048 else 320 %}
+    {% set _memory_mysql = 512 if ansible_memtotal_mb >= 2000 else 320 %}
 {%- endif -%}
 
 {%- if reserved_memory is defined and reserved_memory.system is defined -%}
     {% set _memory_system = reserved_memory.system %}
 {%- else -%}
-    {% set _memory_system = 512 if ansible_memtotal_mb >= 2048 else ((ansible_memtotal_mb/4) | round) %}
+    {% set _memory_system = 512 if ansible_memtotal_mb >= 2000 else ((ansible_memtotal_mb/4) | round) %}
 {%- endif -%}
 
 {%- if apache_settings is defined and apache_settings.start_servers is defined -%}
     {% set _apache_start_servers = apache_settings.start_servers %}
 {%- else -%}
-    {% set _apache_start_servers = 5 if ansible_memtotal_mb >= 2048 else 2 %}
+    {% set _apache_start_servers = 10 if ansible_memtotal_mb >= 2000 else 3 %}
 {%- endif -%}
 
 {%- if apache_settings is defined and apache_settings.min_spare_servers is defined -%}
     {% set _apache_min_spare_servers = apache_settings.min_spare_servers %}
 {%- else -%}
-    {% set _apache_min_spare_servers = 5 if ansible_memtotal_mb >= 2048 else 2 %}
+    {% set _apache_min_spare_servers = 8 if ansible_memtotal_mb >= 2000 else 3 %}
 {%- endif -%}
 
 {%- if apache_settings is defined and apache_settings.max_spare_servers is defined -%}
     {% set _apache_max_spare_servers = apache_settings.max_spare_servers %}
 {%- else -%}
-    {% set _apache_max_spare_servers = 10 if ansible_memtotal_mb >= 2048 else 3 %}
+    {% set _apache_max_spare_servers = 15 if ansible_memtotal_mb >= 2000 else 3 %}
 {%- endif -%}
 
 {%- if apache_settings is defined and apache_settings.max_requests_per_child is defined -%}
@@ -43,8 +43,11 @@
 {%- if apache_settings is defined and apache_settings.max_clients is defined -%}
     {% set _apache_max_clients = apache_settings.max_clients %}
 {%- else -%}
-    {% set _apache_max_clients = ((ansible_memtotal_mb - _memory_system - _memory_mysql) / (_memory_php|int/2)) | round(method='ceil') | int %}
-    {%- if _apache_max_clients < 5 -%}
+    {%- if ansible_memtotal_mb >= 2000 -%}
+        {% set _apache_max_clients = 25 -%}
+    {%- elif ansible_memtotal_mb >= 900 -%}
+        {% set _apache_max_clients = 10 -%}
+    {%- else -%}
         {% set _apache_max_clients = 5 %}
     {%- endif -%}
 {%- endif -%}