Merge pull request #56 from YunoHost-Apps/version-2

Version 2

README.md

@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 HumHub is an open source social network platform with a wide variety of use cases as social intranet, community or collaboration platform. HumHub consists of a core application, which can be extended through additional modules and adjusted to your needs by many configuration options. 
 
 
-**Shipped version:** 1.13.1~ynh1
+**Shipped version:** 1.14.0~ynh1
 
 **Demo:** https://www.humhub.com/en
 

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 HumHub est une plate-forme de réseau social open source avec une grande variété de cas d'utilisation en tant qu'intranet social, plate-forme de communauté ou de collaboration. HumHub se compose d'une application principale, qui peut être étendue grâce à des modules supplémentaires et ajustée à vos besoins par de nombreuses options de configuration.
 
 
-**Version incluse :** 1.13.1~ynh1
+**Version incluse :** 1.14.0~ynh1
 
 **Démo :** https://www.humhub.com/en
 

check_process

@@ -1,26 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		is_public=1
-		admin="john"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		#upgrade=1	from_commit=
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=0
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=
-		name=
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&

conf/app.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://download.humhub.com/downloads/install/humhub-1.13.1.tar.gz
-SOURCE_SUM=ad618f284e131e600024816a42c66a95f84fcc192cd5e2f82d2465cf0c3ed882
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true

conf/cron

@@ -1,2 +1,2 @@
-* * * * * __NAME__ /usr/bin/php__PHPVERSION__  __FINALPATH__/protected/yii queue/run >/dev/null 2>&1
+* * * * * __APP__ /usr/bin/php__PHPVERSION__  __INSTALL_DIR__/protected/yii queue/run >/dev/null 2>&1
-* * * * * __NAME__ /usr/bin/php__PHPVERSION__  __FINALPATH__/protected/yii cron/run >/dev/null 2>&1
+* * * * * __APP__ /usr/bin/php__PHPVERSION__  __INSTALL_DIR__/protected/yii cron/run >/dev/null 2>&1

conf/nginx.conf

@@ -2,12 +2,12 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/;
+  alias __INSTALL_DIR__/;
 
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
-  #client_max_body_size 50M;
+  client_max_body_size 1G;
 
   try_files $uri $uri/ index.php?$args;
   location ~ [^/]\.php(/|$) {

manifest.json

@@ -1,55 +0,0 @@
-{
-    "name": "HumHub",
-    "id": "humhub",
-    "packaging_format": 1,
-    "description": {
-        "en": "Enterprise Social Network",
-        "fr": "Réseau Social d'Entreprise"
-    },
-    "version": "1.13.1~ynh1",
-    "url": "https://www.humhub.org",
-    "upstream": {
-        "license": "AGPL-3.0-only",
-        "website": "https://www.humhub.org",
-        "demo": "https://www.humhub.com/en",
-        "admindoc": "https://docs.humhub.org",
-        "code": "https://github.com/humhub/humhub"
-    },
-    "license": "AGPL-3.0-only",
-    "maintainer": {
-        "name": "Nils Van Zuijlen",
-        "url": "https://github.com/nils-van-zuijlen"
-    },
-    "requirements": {
-        "yunohost": ">= 11.0.9"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx",
-        "php8.0-fpm",
-        "mysql"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/humhub",
-                "default": "/humhub"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "default": false
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,60 @@
+packaging_format = 2
+
+id = "humhub"
+name = "HumHub"
+description.en = "Enterprise Social Network"
+description.fr = "Réseau Social d'Entreprise"
+
+version = "1.14.0~ynh1"
+
+maintainers = ["Nils Van Zuijlen"]
+
+[upstream]
+license = "AGPL-3.0-only"
+website = "https://www.humhub.org"
+demo = "https://www.humhub.com/en"
+admindoc = "https://docs.humhub.org"
+code = "https://github.com/humhub/humhub"
+
+[integration]
+yunohost = ">= 11.1.18"
+architectures = "all"
+multi_instance = true
+ldap = true
+sso = false
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.path]
+    type = "path"
+    default = "/humhub"
+
+    [install.init_main_permission]
+    type = "group"
+    default = false
+
+    [install.admin]
+    type = "user"
+
+[resources]
+        [resources.sources.main]
+        url = "https://download.humhub.com/downloads/install/humhub-1.14.0.tar.gz"
+        sha256 = "d75923ca8d18d5e031c4ed4a4e2e9ce98fb61fbfcf5268317a76803f7a82a22a"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
+
+    [resources.apt]
+    packages = "mariadb-server php8.0-imagick php8.0-curl php8.0-bz2 php8.0-gd php8.0-intl php8.0-mysql php8.0-zip php8.0-apcu php8.0-xml php8.0-ldap"
+
+    [resources.database]
+    type = "mysql"

scripts/_common.sh

@@ -4,13 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION=8.0
-
-php_dependencies="php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap"
-
-# dependencies used by the app (must be on a single line)
-pkg_dependencies="$php_dependencies"
-
 HUMHUB_AUTH_BASIC_VERSION=0.1.0
 HUMHUB_AUTH_BASIC_PATH="/protected/modules/auth-basic"
 
@@ -21,9 +14,9 @@ HUMHUB_AUTH_BASIC_PATH="/protected/modules/auth-basic"
 local_curl_csrf () {
     # Define url of page to curl
     local local_page=$1
-    local full_path=$path_url$local_page
+    local full_path=$path$local_page
 
-    if [ "${path_url}" == "/" ]; then
+    if [ "${path}" == "/" ]; then
         full_path=$local_page
     fi
 
@@ -80,8 +73,8 @@ install_sso() {
     tmp_auth_basic_module="$(mktemp /tmp/humhub_ynh.XXXXXX)"
     wget -q -O $tmp_auth_basic_module "https://github.com/smart4life/humhub-auth-basic/archive/refs/tags/$HUMHUB_AUTH_BASIC_VERSION.tar.gz"
 
-    tar xf $tmp_auth_basic_module -C $final_path/protected/modules
+    tar xf $tmp_auth_basic_module -C $install_dir/protected/modules
-    mv $final_path/protected/modules/humhub-auth-basic* $final_path/$HUMHUB_AUTH_BASIC_PATH
+    mv $install_dir/protected/modules/humhub-auth-basic* $install_dir/$HUMHUB_AUTH_BASIC_PATH
 
     ynh_secure_remove $tmp_auth_basic_module
 }

scripts/backup

@@ -10,28 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-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)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -41,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/change_url

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
+source /usr/share/yunohost/helpers
+
+#=================================================
+# MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
+
+ynh_change_url_nginx_config
+
+#=================================================
+# UPDATE HUMHUB CONFIGURATION
+#=================================================
+ynh_script_progression --message="Updating HUMHUB configuration..." --weight=1
+
+pushd $install_dir/protected
+	php$phpversion yii settings/set base baseUrl http://$new_domain$new_path
+popd
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -9,92 +9,29 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
-admin=$YNH_APP_ARG_ADMIN
-
-app=$YNH_APP_INSTANCE_NAME
 fpm_footprint="low"
 fpm_free_footprint=0
 fpm_usage="low"
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-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
 ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
 ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=1
-
-ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=2
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
-#=================================================
-# CREATE A MYSQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a MySQL database..." --weight=1
-
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
+ynh_setup_source --dest_dir="$install_dir"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -103,7 +40,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # NGINX CONFIGURATION
@@ -119,7 +55,7 @@ ynh_add_nginx_config
 # SETUP SQL CREDENTIALS
 #=================================================
 
-ynh_add_config --template="../conf/common.php" --destination="$final_path/protected/config/common.php"
+ynh_add_config --template="../conf/common.php" --destination="$install_dir/protected/config/common.php"
 
 #=================================================
 # DEACTIVATE DEBUG MODE
@@ -127,34 +63,30 @@ ynh_add_config --template="../conf/common.php" --destination="$final_path/protec
 
 ynh_replace_string --match_string="defined('YII_DEBUG') or define('YII_DEBUG', true);"\
  --replace_string="// defined('YII_DEBUG') or define('YII_DEBUG', true);"\
- --target_file="$final_path/index.php"
+ --target_file="$install_dir/index.php"
 ynh_replace_string --match_string="defined('YII_ENV') or define('YII_ENV', 'dev');"\
  --replace_string="// defined('YII_ENV') or define('YII_ENV', 'dev');"\
- --target_file="$final_path/index.php"
+ --target_file="$install_dir/index.php"
 
 #=================================================
 # SETUP APPLICATION WITH CURL
 #=================================================
 
 # Set right permissions for curl install
-chown -R $app: $final_path
+chown -R $app: $install_dir
 
 # Set the app as temporarily public for curl call
 ynh_script_progression --message="Configuring SSOwat..." --weight=30
-# Making the app public for curl
+
-ynh_permission_update --permission="main" --add="visitors"
 # Reload SSOwat config
 yunohost app ssowatconf
 
-# Reload NGINX
-ynh_systemd_action --service_name=nginx --action=reload
-
 # Installation with curl
 ynh_script_progression --message="Finalizing installation..." --weight=2
 
 install_sso
 
-pushd $final_path/protected
+pushd $install_dir/protected
 	php$phpversion yii migrate/up --includeModuleMigrations=1 --interactive=0
 
 	php$phpversion yii settings/set ldap enabled '1'
@@ -195,14 +127,11 @@ pushd $final_path/protected
 
 popd
 
-# Remove the public access
+ynh_store_file_checksum --file="$install_dir/protected/config/common.php"
-ynh_permission_update --permission="main" --remove="visitors"
 
-ynh_store_file_checksum --file="$final_path/protected/config/common.php"
+chmod 750 "$install_dir"
-
+chmod -R o-rwx "$install_dir"
-chmod 750 "$final_path"
+chown -R $app:www-data "$install_dir"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
 
 #=================================================
 # SETUP CRON CONFIGURATION
@@ -211,28 +140,6 @@ ynh_script_progression --message="Setuping crontab..." --weight=1
 
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=2
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=2
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -9,37 +9,6 @@
 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)
-port=$(ynh_app_setting_get --app=$app --key=port)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
-#=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE THE MYSQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the MySQL database..." --weight=1
-
-# Remove a database if it exists, along with the associated user
-ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
@@ -56,14 +25,6 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # SPECIFIC REMOVE
 #=================================================
@@ -74,16 +35,6 @@ ynh_script_progression --message="Removing various files..." --weight=2
 # Remove a cron file
 ynh_secure_remove --file="/etc/cron.d/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -10,71 +10,16 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# 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)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-
-fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
-fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
-
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
-
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
@@ -83,9 +28,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-# Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
-
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
@@ -98,8 +40,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Restoring the MySQL database..." --weight=2
 
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================

scripts/upgrade

@@ -9,46 +9,12 @@
 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)
-language=$(ynh_app_setting_get --app=$app --key=language)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-
-fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
-fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint)
-fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
-
 #=================================================
 # CHECK VERSION
 #=================================================
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-# 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
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -74,21 +40,6 @@ if [ -z "$fpm_usage" ]; then
     ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
 
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
-#=================================================
-# 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 --home_dir="$final_path"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -101,29 +52,22 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Backup user contents
-	mv "$final_path" "$final_path.old"
+	mv "$install_dir" "$install_dir.old"
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$install_dir"
 
 	# Restore user contents
-	cp -a "$final_path.old/uploads/." "$final_path/uploads/."
+	cp -a "$install_dir.old/uploads/." "$install_dir/uploads/."
-	cp -a "$final_path.old/protected/runtime" "$final_path/protected/runtime"
+	cp -a "$install_dir.old/protected/runtime" "$install_dir/protected/runtime"
-	cp -a "$final_path.old/protected/config/." "$final_path/protected/config/"
+	cp -a "$install_dir.old/protected/config/." "$install_dir/protected/config/"
-	cp -a "$final_path.old/protected/modules/." "$final_path/protected/modules/"
+	cp -a "$install_dir.old/protected/modules/." "$install_dir/protected/modules/"
-	cp -a "$final_path.old/themes/." "$final_path/themes/"
+	cp -a "$install_dir.old/themes/." "$install_dir/themes/"
 
 	# Delete old source
-	ynh_secure_remove --file="$final_path.old"
+	ynh_secure_remove --file="$install_dir.old"
 fi
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -131,7 +75,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # NGINX CONFIGURATION
@@ -149,10 +92,10 @@ ynh_add_nginx_config
 
 ynh_replace_string --match_string="defined('YII_DEBUG') or define('YII_DEBUG', true);"\
  --replace_string="// defined('YII_DEBUG') or define('YII_DEBUG', true);"\
- --target_file="$final_path/index.php"
+ --target_file="$install_dir/index.php"
 ynh_replace_string --match_string="defined('YII_ENV') or define('YII_ENV', 'dev');"\
  --replace_string="// defined('YII_ENV') or define('YII_ENV', 'dev');"\
- --target_file="$final_path/index.php"
+ --target_file="$install_dir/index.php"
 
 #=================================================
 # SETUP APPLICATION
@@ -162,16 +105,16 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Setuping application..." --weight=1
 
-	if [[ ! -d $final_path/$HUMHUB_AUTH_BASIC_PATH ]]; then
+	if [[ ! -d $install_dir/$HUMHUB_AUTH_BASIC_PATH ]]; then
 		install_sso
 
-		pushd $final_path/protected
+		pushd $install_dir/protected
 			php$phpversion yii module/enable auth-basic
 		popd
 	else
-		current_version=$(cat $final_path/$HUMHUB_AUTH_BASIC_PATH/module.json | jq -j '.version')
+		current_version=$(cat $install_dir/$HUMHUB_AUTH_BASIC_PATH/module.json | jq -j '.version')
 		if [ "$current_version" != "$HUMHUB_AUTH_BASIC_VERSION" ]; then
-			ynh_secure_remove $final_path/$HUMHUB_AUTH_BASIC_PATH
+#REMOVEME? 			ynh_secure_remove $install_dir/$HUMHUB_AUTH_BASIC_PATH
 			install_sso
 		fi
 	fi
@@ -182,20 +125,20 @@ fi
 #=================================================
 ynh_script_progression --message="Migrating database..." --weight=1
 
-chown -R $app $final_path/
+chown -R $app $install_dir/
 
-ynh_exec_as $app /usr/bin/php$phpversion $final_path/protected/yii migrate/up --includeModuleMigrations=1 --interactive=0
+ynh_exec_as $app /usr/bin/php$phpversion $install_dir/protected/yii migrate/up --includeModuleMigrations=1 --interactive=0
 
 #=================================================
 # UPDATE MODULES
 #=================================================
 ynh_script_progression --message="Updating modules..." --weight=1
 
-ynh_exec_as $app /usr/bin/php$phpversion $final_path/protected/yii module/update-all --interactive=0
+ynh_exec_as $app /usr/bin/php$phpversion $install_dir/protected/yii module/update-all --interactive=0
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # UPGRADE CRONTAB
@@ -204,15 +147,6 @@ ynh_script_progression --message="Upgrading crontab..." --weight=1
 
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

tests.toml

@@ -0,0 +1,3 @@
+test_format = 1.0
+
+[default]