From 51dc246f2a10856cad2f325a4c72da95b031d5e2 Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Mon, 8 Oct 2018 19:17:16 +0200
Subject: [PATCH] Revert "[enh] move specific php.ini defines to the pool
 configuration"

---
 conf/php-fpm.conf | 8 --------
 conf/php-fpm.ini  | 7 +++++++
 scripts/backup    | 1 +
 scripts/restore   | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 conf/php-fpm.ini

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 2571613..485c87b 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -397,11 +397,3 @@ php_value[upload_max_filesize] = 10G
 php_value[post_max_size] = 10G
 php_value[default_charset] = UTF-8
 php_value[always_populate_raw_post_data] = -1
-php_value[opcache.enable]=1
-php_value[opcache.enable_cli]=1
-php_value[opcache.interned_strings_buffer]=8
-php_value[opcache.max_accelerated_files]=10000
-php_value[opcache.memory_consumption]=128
-php_value[opcache.save_comments]=1
-php_value[opcache.revalidate_freq]=1
-
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
new file mode 100644
index 0000000..104f242
--- /dev/null
+++ b/conf/php-fpm.ini
@@ -0,0 +1,7 @@
+opcache.enable=1
+opcache.enable_cli=1
+opcache.interned_strings_buffer=8
+opcache.max_accelerated_files=10000
+opcache.memory_consumption=128
+opcache.save_comments=1
+opcache.revalidate_freq=1
diff --git a/scripts/backup b/scripts/backup
index 0a1f69c..aecf0c0 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -52,6 +52,7 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 
 ynh_backup "/etc/php5/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index 7f601db..44a7f58 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -77,6 +77,7 @@ ynh_system_user_create $app
 #=================================================
 
 ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
+ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # SPECIFIC RESTORATION