From a4745144ccead0a9d3184746af50e8fa107974d5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 7 Jul 2021 11:43:28 +0200
Subject: [PATCH] Fix

---
 conf/nginx.conf    |  2 +-
 manifest.json      | 22 ----------------------
 scripts/backup     |  1 -
 scripts/change_url |  5 -----
 scripts/install    | 19 -------------------
 scripts/remove     |  1 -
 scripts/restore    |  1 -
 scripts/upgrade    |  1 -
 8 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index ff96b89..d672a7c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -17,7 +17,7 @@ location __PATH__/ {
 
   index index.php;
 
-  #try_files $uri $uri/ index.php;
+  try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
diff --git a/manifest.json b/manifest.json
index 9c1f659..6567364 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,28 +34,6 @@
                 "example": "/bbs",
                 "default": "/bbs"
             },
-            {
-                "name": "admin",
-                "type": "user",
-                "example": "johndoe"
-            },
-            {
-                "name": "password",
-                "type": "password",
-                "ask": {
-                    "en": "Choose a password for the admin user",
-                    "fr": "Choisissez un mot de passe pour l’administrateur"
-                }
-            },
-            {
-                "name": "login",
-                "type": "boolean",
-                "ask": {
-                    "en": "Disable BicBucStriim login?",
-                    "fr": "Désactiver l'authentification BicBucStriim ?"
-                },
-                "default": true
-            },
             {
                 "name": "is_public",
                 "type": "boolean",
diff --git a/scripts/backup b/scripts/backup
index fe9b9f8..4edd67a 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -23,7 +23,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index 495b7eb..11f740d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -29,11 +29,6 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
-# Add settings here as needed by your application
-#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#db_user=$db_name
-#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
-
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
diff --git a/scripts/install b/scripts/install
index 47b454b..20a63a3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,10 +25,7 @@ app=$YNH_APP_INSTANCE_NAME
 # Retrieve arguments
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
-login=$YNH_APP_ARG_LOGIN
-password=$YNH_APP_ARG_PASSWORD
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -48,7 +45,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=admin --value=$admin
 
 #=================================================
 # CREATE DEDICATED USER
@@ -89,21 +85,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
-
-# Disable BicBucStriim login if checked
-if [[ $login -eq 1 ]]; then
-  sed -i -- 's/\[LOGIN_REQUIRED\] = 1/\[LOGIN_REQUIRED\] = 0/g' $final_path/index.php
-fi
-
-#=================================================
-# HASH PASSWORD
-#=================================================
-
-cp ../conf/password.php $final_path/ynh_password.php
-cd $final_path
-hash=$(php${phpversion} ynh_password.php $password)
-rm ynh_password.php
-
 #=================================================
 # SETUP SSOWAT
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index d1e820b..cf4f173 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,7 +17,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=3
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 54a018c..03051f3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -25,7 +25,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get "$app" domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-admin=$(ynh_app_setting_get "$app" admin)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c2f5b21..f73c120 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get "$app" domain)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-admin=$(ynh_app_setting_get "$app" admin)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================