fix

check_process

@@ -20,8 +20,8 @@
 		setup_public=1
 		upgrade=1
 		backup_restore=1
-		multi_instance=1
+		multi_instance=0
-		change_url=1
+		change_url=0
 ;;; Options
 Email=
 Notification=none

scripts/install

@@ -125,14 +125,14 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
 # ynh_script_progression --message="Finalizing installation..." --weight=10
 
 # # Installation with cURL
-# installUrl="/admin/install.php?submit"
+# installUrl="/install.php?submit"
 
 # ynh_local_curl $installUrl "install=2" "db_type=psql" "hostname=localhost" "db_username=$db_user" "db_password=$db_pwd" "database_name=$db_name" "admin_username=" "admin_password=" "db_table_prefix=$db_name" "db_table_plugin_prefix=plugin" "db_table_suffix=_table" "timezone=UTC"
 
-# # Remove the `admin/` directory from within the MantisBT installation path.
+# # Remove the `install.php` directory from within the Noalyss installation path.
-# # The scripts within this directory should not be accessible on a live MantisBT site
+# # The scripts within this directory should not be accessible on a live Noalyss site
 # # or on any installation that is accessible via the Internet.
-# ynh_secure_remove "$final_path/admin"
+# ynh_secure_remove "$final_path/html/install.php"
 
 # # Set the user chosen at installation as administrator
 # #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;"

scripts/upgrade

@@ -0,0 +1,173 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
+
+app=$YNH_APP_INSTANCE_NAME
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
+db_user=$db_name
+phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
+
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+
+# Fix is_public as a boolean value
+if [ "$is_public" = "Yes" ]; then
+	ynh_app_setting_set --app=$app --key=is_public --value=1
+	is_public=1
+elif [ "$is_public" = "No" ]; then
+	ynh_app_setting_set --app=$app --key=is_public --value=0
+	is_public=0
+fi
+
+# If db_name doesn't exist, create it
+if [ -z "$db_name" ]; then
+	db_name=$(ynh_sanitize_dbid --db_name=$app)
+	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+fi
+
+# If final_path doesn't exist, create it
+if [ -z "$final_path" ]; then
+	final_path=/var/www/$app
+	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+fi
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=5
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Upgrading source files..." --weight=5
+
+	# Create a temporary directory
+	tmpdir="$(mktemp -d)"
+
+	cp -a "$final_path/include/config.inc.php" "$tmpdir/config.inc.php"
+
+	# Remove the app directory securely
+	ynh_secure_remove --file=$final_path
+
+	# Download, check integrity, uncompress and patch the source from app.src
+	ynh_setup_source --dest_dir=$final_path
+
+	cp -a "$tmpdir/config.inc.php" "$final_path/include/config.inc.php"
+
+	# Remove the tmp directory securely
+	ynh_secure_remove --file="$tmpdir"
+fi
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=2
+
+ynh_install_app_dependencies $pkg_dependencies
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app
+
+#=================================================
+# PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
+
+# Create a dedicated PHP-FPM config
+ynh_add_fpm_config --package="$extra_php_dependencies"
+
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chown -R $app: $final_path
+chown $app: $final_path/include/constant.php
+
+#=================================================
+# SETUP APPLICATION WITH CURL
+#=================================================
+
+# # Set the app as temporarily public for cURL call
+# ynh_permission_update --permission "main" --add "visitors"
+
+# # Reload NGINX
+# ynh_systemd_action --service_name=nginx --action=reload
+
+# ynh_script_progression --message="Finalizing installation..." --weight=10
+
+# # Installation with cURL
+# installUrl="/install.php?submit"
+
+# ynh_local_curl $installUrl "install=2" "lang=fr_FR.utf8"
+
+# # Remove the `install.php` directory from within the Noalyss installation path.
+# # The scripts within this directory should not be accessible on a live Noalyss site
+# # or on any installation that is accessible via the Internet.
+# ynh_secure_remove "$final_path/html/install.php"
+
+# # Set the user chosen at installation as administrator
+# #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;"
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+ynh_script_progression --message="Upgrade of $app completed" --last