From 2588f45c2f3553fc4f36e2cfc2c228dfba9163fa Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 2 Oct 2018 01:11:07 +0200
Subject: [PATCH] Remove ini file for php

---
 conf/php-fpm.conf | 11 +++++++++++
 conf/php-fpm.ini  | 10 ----------
 scripts/backup    |  1 -
 scripts/restore   |  1 -
 4 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 conf/php-fpm.ini

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 8affbc2..58ab5e2 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -390,3 +390,14 @@ catch_workers_output = yes
 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
+
+; Common values to change to increase file upload limit
+; php_admin_value[upload_max_filesize] = 50M
+; php_admin_value[post_max_size] = 50M
+; php_admin_flag[mail.add_x_header] = Off
+
+; Other common parameters
+; php_admin_value[max_execution_time] = 600
+; php_admin_value[max_input_time] = 300
+; php_admin_value[memory_limit] = 256M
+; php_admin_flag[short_open_tag] = On
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index 5c27d59..0000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-; Common values to change to increase file upload limit
-; upload_max_filesize = 50M
-; post_max_size = 50M
-; mail.add_x_header = Off
-
-; Other common parameters
-; max_execution_time = 600
-; max_input_time = 300
-; memory_limit = 256M
-; short_open_tag = On
diff --git a/scripts/backup b/scripts/backup
index b7448e5..c92c1d0 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -49,7 +49,6 @@ 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 92c999d..8dbba8a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -81,7 +81,6 @@ chown -R root: $final_path
 #=================================================
 
 ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
-ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # SPECIFIC RESTORATION