Merge pull request #60 from YunoHost-Apps/testing

Testing
2024-09-03 19:26:11 +02:00 · 2024-01-01 17:14:31 +01:00 · 2024-01-01 17:14:31 +01:00 · e42ada8a53
commit e42ada8a53
parent d137e39b26 f72f1cbb61
8 changed files with 25 additions and 54 deletions
--- a/README.md
+++ b/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.14.0~ynh1
+**Shipped version:** 1.15.2~ynh1

 **Demo:** https://www.humhub.com/en

--- a/README_fr.md
+++ b/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.14.0~ynh1
+**Version incluse :** 1.15.2~ynh1

 **Démo :** https://www.humhub.com/en

--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "HumHub"
 description.en = "Enterprise Social Network"
 description.fr = "Réseau Social d'Entreprise"

-version = "1.14.0~ynh1"
+version = "1.15.2~ynh1"

 maintainers = ["Nils Van Zuijlen"]

@ -17,11 +17,14 @@ admindoc = "https://docs.humhub.org"
 code = "https://github.com/humhub/humhub"

 [integration]
-yunohost = ">= 11.1.18"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = true
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@ -43,8 +46,8 @@ ram.runtime = "50M"

 [resources]
        [resources.sources.main]
-        url = "https://download.humhub.com/downloads/install/humhub-1.14.0.tar.gz"
-        sha256 = "d75923ca8d18d5e031c4ed4a4e2e9ce98fb61fbfcf5268317a76803f7a82a22a"
+        url = "https://download.humhub.com/downloads/install/humhub-1.15.2.tar.gz"
+        sha256 = "fe376390fdfc2037fdf130b21fcc54c027b7c3a3e659e85d6243f53c09566154"

    [resources.system_user]

@ -54,7 +57,7 @@ ram.runtime = "50M"
    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"
+    packages = "mariadb-server, php8.2-imagick, php8.2-curl, php8.2-bz2, php8.2-gd, php8.2-intl, php8.2-mysql, php8.2-zip, php8.2-apcu, php8.2-xml, php8.2-ldap"

    [resources.database]
    type = "mysql"
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================

-HUMHUB_AUTH_BASIC_VERSION=0.1.1
+HUMHUB_AUTH_BASIC_VERSION=0.2.0
 HUMHUB_AUTH_BASIC_PATH="/protected/modules/auth-basic"

 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -41,11 +41,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

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=4
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config

@ -55,7 +50,7 @@ ynh_add_nginx_config
 # SETUP SQL CREDENTIALS
 #=================================================

-ynh_add_config --template="../conf/common.php" --destination="$install_dir/protected/config/common.php"
+ynh_add_config --template="common.php" --destination="$install_dir/protected/config/common.php"

 #=================================================
 # DEACTIVATE DEBUG MODE
@ -138,7 +133,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Setuping crontab..." --weight=1

-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}"
+ynh_add_config --template="cron" --destination="/etc/cron.d/${app}"

 #=================================================
 # END OF SCRIPT
--- a/scripts/remove
+++ b/scripts/remove
@ -12,26 +12,14 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1

 # Remove the dedicated NGINX config
 ynh_remove_nginx_config

-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config

-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..." --weight=2
-
 # Remove a cron file
 ynh_secure_remove --file="/etc/cron.d/$app"

--- a/scripts/restore
+++ b/scripts/restore
@ -21,20 +21,6 @@ chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=5
-
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
-
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
@ -43,9 +29,13 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=2
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql

 #=================================================
-# RESTORE VARIOUS FILES
+# RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring various files..." --weight=1
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=5
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 ynh_restore_file --origin_path="/etc/cron.d/$app"

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -23,19 +23,19 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1

 # If fpm_footprint doesn't exist, create it
-if [ -z "$fpm_footprint" ]; then
+if [ -z "${fpm_footprint:-}" ]; then
    fpm_footprint=low
    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi

 # If fpm_free_footprint doesn't exist, create it
-if [ -z "$fpm_free_footprint" ]; then
+if [ -z "${fpm_free_footprint:-}" ]; then
    fpm_free_footprint=0
    ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
 fi

 # If fpm_usage doesn't exist, create it
-if [ -z "$fpm_usage" ]; then
+if [ -z "${fpm_usage:-}" ]; then
    fpm_usage=low
    ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
@ -76,11 +76,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

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config

@ -114,7 +109,7 @@ then
 	else
 		current_version=$(cat $install_dir/$HUMHUB_AUTH_BASIC_PATH/module.json | jq -j '.version')
 		if [ "$current_version" != "$HUMHUB_AUTH_BASIC_VERSION" ]; then
-#REMOVEME? 			ynh_secure_remove $install_dir/$HUMHUB_AUTH_BASIC_PATH
+			ynh_secure_remove $install_dir/$HUMHUB_AUTH_BASIC_PATH
 			install_sso
 		fi
 	fi
@ -145,7 +140,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading crontab..." --weight=1

-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}"
+ynh_add_config --template="cron" --destination="/etc/cron.d/${app}"

 #=================================================
 # END OF SCRIPT