From 5b36f2a61843e4fda29f89468227de507ee4c9a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 6 Dec 2020 11:27:44 +0100
Subject: [PATCH] Testing (#5)

* Fix linter warnings
---
 check_process   | 6 ++----
 manifest.json   | 6 +++++-
 scripts/install | 5 +----
 scripts/restore | 4 ++--
 scripts/upgrade | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/check_process b/check_process
index 4dab04f..c2dc531 100644
--- a/check_process
+++ b/check_process
@@ -8,16 +8,14 @@
 		setup_sub_dir=1
 		setup_root=1
 		setup_nourl=0
-		setup_private=0
-		setup_public=0
+		setup_private=1
+		setup_public=1
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
 		port_already_use=0
 		change_url=1
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index 575c260..79c598b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,7 +10,7 @@
   "url": "www.bludit.com",
   "license": "MIT",
   "maintainer": {
-    "name": "",
+    "name": "eric_G",
     "email": ""
   },
   "requirements": {
@@ -49,6 +49,10 @@
         "en": "Is it a public application?",
         "fr": "Est-ce une application publique ?"
     },
+    "help": {
+      "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+      "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+        },
         "default": true
       }
     ]
diff --git a/scripts/install b/scripts/install
index 4276fe2..82a0fae 100644
--- a/scripts/install
+++ b/scripts/install
@@ -34,9 +34,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
-# Normalize the url path syntax
-path_url=$(ynh_normalize_url_path $path_url)
-
 # Register (book) web path
 ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
@@ -80,7 +77,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 8c4d6e0..33d914d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,7 +74,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -83,7 +83,7 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
 
-ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
+ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6f1179f..7ebb002 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,7 +75,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE