From 736cd6ae2a7f4468afc080e04a7006cd74b6fb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Mennetrier?= Date: Wed, 31 May 2023 09:19:09 +0200 Subject: [PATCH 1/9] Use module auth-basic 0.2.0 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5af9744..561525b 100644 --- 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" #================================================= From a79d03f17c11849558b95f9c3586124b8f00465b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Sep 2023 22:50:02 +0200 Subject: [PATCH 2/9] cleaning --- manifest.toml | 4 ++-- scripts/install | 5 ----- scripts/remove | 12 ------------ scripts/restore | 22 ++++++---------------- scripts/upgrade | 5 ----- 5 files changed, 8 insertions(+), 40 deletions(-) diff --git a/manifest.toml b/manifest.toml index 178000c..07272fa 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ 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 @@ -54,7 +54,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.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" diff --git a/scripts/install b/scripts/install index d4c5d1b..d12b2b1 100644 --- 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 diff --git a/scripts/remove b/scripts/remove index 4a6d587..fca489d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,21 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # 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" diff --git a/scripts/restore b/scripts/restore index 103889e..b5f296c 100644 --- 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" diff --git a/scripts/upgrade b/scripts/upgrade index ad68709..324cad9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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 From b12d43e60aafd4f709a4a289e47556c8feb88947 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Dec 2023 17:30:54 +0000 Subject: [PATCH 3/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dc65eb5..a02aed6 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ HumHub is an open source social network platform with a wide variety of use case * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 7de8ac6..c64cf6f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ HumHub est une plate-forme de réseau social open source avec une grande variét * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 854e755c527240e09a86481272d11107684d728f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 18:31:31 +0100 Subject: [PATCH 4/9] Update manifest.toml --- manifest.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 07272fa..deea2cb 100644 --- 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.14.0~ynh2" maintainers = ["Nils Van Zuijlen"] @@ -20,8 +20,11 @@ code = "https://github.com/humhub/humhub" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From 0fa154667565a3263c56ba3ac85c9f57589da047 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Dec 2023 17:31:39 +0000 Subject: [PATCH 5/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a02aed6..3574c57 100644 --- 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.14.0~ynh2 **Demo:** https://www.humhub.com/en diff --git a/README_fr.md b/README_fr.md index c64cf6f..bbac634 100644 --- 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.14.0~ynh2 **Démo :** https://www.humhub.com/en From e1d4f44b1dc8145baa8266c4ffc637fd0e81dbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 18:34:17 +0100 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index deea2cb..8b04a51 100644 --- 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~ynh2" +version = "1.15.2~ynh1" maintainers = ["Nils Van Zuijlen"] @@ -46,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] From 4f54223d7e677310b9f292da2a1e322be4826276 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Dec 2023 17:34:30 +0000 Subject: [PATCH 7/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3574c57..103deba 100644 --- 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~ynh2 +**Shipped version:** 1.15.2~ynh1 **Demo:** https://www.humhub.com/en diff --git a/README_fr.md b/README_fr.md index bbac634..41c9f09 100644 --- 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~ynh2 +**Version incluse :** 1.15.2~ynh1 **Démo :** https://www.humhub.com/en From 01a7aa3bee0c2136dea573a862c15c17757fc992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 18:35:07 +0100 Subject: [PATCH 8/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8b04a51..4934d6e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,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" From f72f1cbb617ff3a2bf9eacceea843f18204f4981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 27 Dec 2023 18:38:29 +0100 Subject: [PATCH 9/9] cleaning --- scripts/install | 4 ++-- scripts/remove | 2 +- scripts/upgrade | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index d12b2b1..5db9579 100644 --- a/scripts/install +++ b/scripts/install @@ -50,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 @@ -133,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 diff --git a/scripts/remove b/scripts/remove index fca489d..e2b70a3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ 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 diff --git a/scripts/upgrade b/scripts/upgrade index 324cad9..74eb7b8 100644 --- 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 @@ -109,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 @@ -140,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