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

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

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 7bad39e..cec73f5 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -389,4 +389,7 @@ catch_workers_output = yes
 ;php_flag[display_errors] = off
 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
 ;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
\ No newline at end of file
+;php_admin_value[memory_limit] = 32M
+
+php_admin_value[upload_max_filesize] = 30M
+php_admin_value[post_max_size] = 30M
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index 55e2ba7..0000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-upload_max_filesize=30M
-post_max_size=30M
-; max_execution_time=60
\ No newline at end of file
diff --git a/scripts/backup b/scripts/backup
index 0f35234..4deae33 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 bf75e1a..db99773 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -97,7 +97,6 @@ chown -R $app: "${final_path}/temp/" "${final_path}/logs/"
 #=================================================
 
 ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf"
-ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 
 #=================================================
 # GENERIC FINALISATION