diff --git a/tasks/php.yml b/tasks/php.yml index a2651fcac20c48c1f294c36eb7a24bc6aa269006..5f6ae043835f8024323d5de899a29cf343f17dcd 100644 --- a/tasks/php.yml +++ b/tasks/php.yml @@ -46,16 +46,6 @@ notify: - "Apache | Restart Apache" -- name: "PHP | Cache configuration file, apc.ini" - template: - src=etc-php5-conf-d-apc.ini - dest=/etc/{{ php_base_dir }}/{{ php_conf_dir }}/apc.ini - owner=root - group=root - mode=0644 - notify: - - "Apache | Restart Apache" - - name: "PHP | Cache configuration file, opcache.ini" template: src=etc-php5-conf-d-opcache.ini diff --git a/templates/etc-php5-apache2-php.ini b/templates/etc-php5-apache2-php.ini index 16bb5fda270d68df7a9335052eaa6f79f27d7948..738adff04db67c9a492d5c7ead1dc6edc29636da 100644 --- a/templates/etc-php5-apache2-php.ini +++ b/templates/etc-php5-apache2-php.ini @@ -1970,10 +1970,13 @@ define_syslog_variables = Off {% if php_version|default('5.5') == '5.3' %} [apc] extension = apc.so -apc.rfc1867 = 1 -apc.shm_size = 256M -apc.shm_segments = 1 -apc.num_files_hint = 0 +apc.rfc1867 = {{ apc_rfc1867 }} +apc.shm_size = {{ apc_shm_size }} +apc.shm_segments = {{ apc_shm_segments }} +apc.num_files_hint = {{ apc_num_files_hint }} +apc.ttl = {{ apc_ttl }} +apc.user_ttl = {{ apc_user_ttl }} +apc.gc_ttl = {{ apc_gc_ttl }} [imagick] extension=imagick.so diff --git a/templates/etc-php5-conf-d-apc.ini b/templates/etc-php5-conf-d-apc.ini deleted file mode 100644 index 807226f40bca555936e1c3ee0c560768f570e53f..0000000000000000000000000000000000000000 --- a/templates/etc-php5-conf-d-apc.ini +++ /dev/null @@ -1,8 +0,0 @@ -extension = apc.so -apc.rfc1867 = {{ apc_rfc1867 }} -apc.shm_size = {{ apc_shm_size }} -apc.shm_segments = {{ apc_shm_segments }} -apc.num_files_hint = {{ apc_num_files_hint }} -apc.ttl = {{ apc_ttl }} -apc.user_ttl = {{ apc_user_ttl }} -apc.gc_ttl = {{ apc_gc_ttl }}