From 1d304999a08fbe4abe175c619913533054ccc5e8 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 29 May 2016 11:47:32 +0200
Subject: [PATCH] #2 Removed apc and only kept it in php.ini for PHP 5.3
---
tasks/php.yml | 10 ----------
templates/etc-php5-apache2-php.ini | 11 +++++++----
templates/etc-php5-conf-d-apc.ini | 8 --------
3 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 templates/etc-php5-conf-d-apc.ini
diff --git a/tasks/php.yml b/tasks/php.yml
index a2651fc..5f6ae04 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 16bb5fd..738adff 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 807226f..0000000
--- 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 }}
--
GitLab