From 5a0d87648b82ade0b2a5cec82edfc4131172eddc Mon Sep 17 00:00:00 2001
From: anmol26s <github@datamol.org>
Date: Wed, 3 Oct 2018 19:02:52 +0530
Subject: [PATCH] Remove ini file for php

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

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 8affbc2e..9955793c 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -390,3 +390,15 @@ 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
+; 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
+cgi.fix_pathinfo = 0;
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index 7490dd7a..00000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,11 +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
-cgi.fix_pathinfo = 0;
diff --git a/scripts/backup b/scripts/backup
index dff5be51..3cfb4fac 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -50,7 +50,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 3a90b668..ee230e0f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -76,7 +76,6 @@ 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