From dfe765cf812c221dc3d2387021bae533e028ca54 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 29 Mar 2022 16:23:37 +0200
Subject: [PATCH] Cleaning up

---
 conf/.env.example       | 2 +-
 conf/extra_php-fpm.conf | 7 -------
 conf/nginx.conf         | 6 +-----
 conf/php-fpm.conf       | 8 ++++----
 scripts/install         | 1 -
 5 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 conf/extra_php-fpm.conf

diff --git a/conf/.env.example b/conf/.env.example
index 8d1f843..ebd3ac4 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -25,7 +25,7 @@ DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=__DB_NAME__
-DB_USERNAME=__DB_NAME__
+DB_USERNAME=__DB_USER__
 DB_PASSWORD=__DB_PWD__
 DB_LOG_SQL=false
 
diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
deleted file mode 100644
index ad8b82c..0000000
--- a/conf/extra_php-fpm.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-; Additional php.ini defines, specific to this pool of workers.
-
-php_admin_value[upload_max_filesize] = 512M
-php_admin_value[post_max_size] = 512M
-php_admin_value[memory_limit] = 256M
-php_admin_value[post_max_size] = 512M
-php_admin_value[max_execution_time] = 200
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0009a71..466fd71 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location ^~ __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/public/ ;
+  alias __FINALPATH__/public/;
 
   index index.php;
 
@@ -32,7 +32,3 @@ location ^~ __PATH__/ {
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
-
-location @lychee {
-    rewrite __PATH__/(.*)$ __PATH__/index.php?/$1 last;
-}
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 676c75d..a4d5b1e 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -419,12 +419,12 @@ chdir = __FINALPATH__
 ;php_admin_value[memory_limit] = 32M
 
 ; Common values to change to increase file upload limit
-php_admin_value[upload_max_filesize] = 100M
-php_admin_value[post_max_size] = 100M
+php_admin_value[upload_max_filesize] = 512M
+php_admin_value[post_max_size] = 512M
 ; php_admin_flag[mail.add_x_header] = Off
 
 ; Other common parameters
-; php_admin_value[max_execution_time] = 600
+php_admin_value[max_execution_time] = 200
 ; php_admin_value[max_input_time] = 300
-; php_admin_value[memory_limit] = 256M
+php_admin_value[memory_limit] = 256M
 ; php_admin_flag[short_open_tag] = On
diff --git a/scripts/install b/scripts/install
index e74cb54..b19f4ff 100755
--- a/scripts/install
+++ b/scripts/install
@@ -44,7 +44,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 
 #=================================================
 # INSTALL DEPENDENCIES