From cd8bd09c0eec45e6cd4e39dd8e07a163d59b16d2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Sun, 17 Feb 2019 22:20:38 +0100
Subject: [PATCH] remove php-fpm.ini and set type=string for language

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

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 6134990..9b801b2 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
\ No newline at end of file
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/manifest.json b/manifest.json
index ac2bff3..76c494e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Grav - Grav is a modern open source flat-file CMS",
 		"fr": "Grav - Grav is a modern open source flat-file CMS"
 	},
-	"version": "1.5.3~ynh3",
+	"version": "1.5.3~ynh4",
 	"url": "https://www.getgrav.org/",
 	"license": "MIT-0",
 	"maintainer": [
@@ -75,6 +75,7 @@
 			},
 			{
 				"name": "language",
+				"type": "string",
 				"ask": {
 					"en": "Choose the application language",
 					"fr": "Choisissez la langue de l'application"
diff --git a/scripts/backup b/scripts/backup
index 40cd8e3..30daf38 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -45,4 +45,3 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 
 ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf"
-ynh_backup "/etc/php/7.0/fpm/conf.d/20-$app.ini"
diff --git a/scripts/restore b/scripts/restore
index a414c9e..d482e68 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -73,7 +73,6 @@ chown -R "$app": "$final_path"
 #=================================================
 
 ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf"
-ynh_restore_file "/etc/php/7.0/fpm/conf.d/20-$app.ini"
 
 
 #=================================================