From 20f522ceaf3db75bac9f5b8acb24744c6a0aa404 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 18:11:50 +0100 Subject: [PATCH 1/4] Upgrade to 18.3-3 --- README.md | 4 ++-- README_fr.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++ check_process | 3 --- conf/app.src | 4 ++-- manifest.json | 12 +++++----- scripts/backup | 11 +++++---- scripts/change_url | 4 ++-- scripts/install | 9 ++++---- scripts/remove | 2 +- scripts/restore | 3 +-- scripts/upgrade | 24 ------------------- 11 files changed, 81 insertions(+), 52 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 7c0b98d..1b3f558 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Anarchism for YunoHost [![Integration level](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) -[![Install anarchism with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=anarchism) +[![Install anarchism with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=anarchism) *[Lire ce readme en français.](./README_fr.md)* @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview This is an anarchist FAQ. Its aim is to present what anarchism really stands for and indicate why you should become an anarchist. -**Shipped version:** 15.3-2 +**Shipped version:** 15.3-3 ## Screenshots diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..013a5b2 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,57 @@ +# Anarchism pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) +[![Installer Anarchism avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=anarchism) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer Anarchism rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* + +## Vue d'ensemble +Ceci est une FAQ anarchiste. Son objectif est de présenter ce que représente vraiment l'anarchisme et d'indiquer pourquoi vous devriez devenir anarchiste. + +**Version incluse :** 15.3-3 + +## Captures d'écran + +![](https://salsa.debian.org/debian/anarchism/raw/debian/15.3-2/debian/anarchism.svg) + +## Démo + +* [Démo officielle](http://anarchism.pageabode.com/afaq/index.html) + +## Documentation + + * Documentation officielle : https://salsa.debian.org/debian/anarchism + +## Caractéristiques spécifiques YunoHost + +#### Support multi-utilisateur + +* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** +* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** + +#### Architectures supportées + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/anarchism%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/anarchism/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/anarchism%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/anarchism/) + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/anarchism_ynh/issues + * Dépôt de l'application principale : https://salsa.debian.org/debian/anarchism/ + * Site web YunoHost : https://yunohost.org/ + +--- + +## Developers info + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug +ou +sudo yunohost app upgrade anarchism -u https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug +``` diff --git a/check_process b/check_process index 1d63d2b..77d3074 100644 --- a/check_process +++ b/check_process @@ -18,11 +18,8 @@ upgrade=1 backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/app.src b/conf/app.src index f8cb524..62a7b74 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://salsa.debian.org/debian/anarchism/-/archive/debian/15.3-2/anarchism-debian-15.3-2.tar.gz -SOURCE_SUM=b925d609c186cbf51bba5c035aae767e2758d54b738794d739c9aa3cfeb2f703 +SOURCE_URL=https://salsa.debian.org/debian/anarchism/-/archive/debian/15.3-3/anarchism-debian-15.3-3.tar.gz +SOURCE_SUM=7d1d7b829774441ef4772f62eed90f4d2842f60f9825ea1cd1b33b473a3edeba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index e9c48cc..f69d8e8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An exhaustive exploration of Anarchist theory and practice.", "fr": "Exploration exhaustive de la théorie et de la pratique anarchiste." }, - "version": "15.3-2~ynh1", + "version": "15.3-3~ynh1", "url": "https://salsa.debian.org/debian/anarchism/", "licence": "GPL-2.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ @@ -26,8 +26,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for ynhexample", - "fr": "Choisissez un nom de domaine pour ynhexample" + "en": "Choose a domain name for Anarchism", + "fr": "Choisissez un nom de domaine pour Anarchism" }, "example": "example.com" }, @@ -35,8 +35,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for ynhexample", - "fr": "Choisissez un chemin pour ynhexample" + "en": "Choose a path for Anarchism", + "fr": "Choisissez un chemin pour Anarchism" }, "example": "/anarchism", "default": "/anarchism" diff --git a/scripts/backup b/scripts/backup index dc34dfe..0b5382b 100644 --- a/scripts/backup +++ b/scripts/backup @@ -23,7 +23,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -31,18 +31,19 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." --weight=1 ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." --weight=1 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -50,4 +51,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index c78da04..df2740f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,7 +50,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -81,7 +81,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 98bee5f..1cdf864 100755 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config @@ -81,19 +81,18 @@ chown -R root: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 8019087..1b2d038 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,7 +32,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 4405669..3b97dd4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -68,9 +68,8 @@ chown -R root: $final_path #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=php7.0-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 22d0cd2..1a9dfd2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,18 +68,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -# N.B. : this is for app installations before YunoHost 2.7 -# where this value might be something like /foo/ or foo/ -# instead of /foo .... -# If nobody installed your app before 2.7, then you may -# safely remove this line -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -111,18 +99,6 @@ ynh_add_nginx_config # Set permissions on app files chown -R root: $final_path -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #================================================= From fa6c99c927bfedf7ebd0e368ff222da6a3859d4a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 18:15:49 +0100 Subject: [PATCH 2/4] Update manifest.json --- manifest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f69d8e8..ab87fd1 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version": "15.3-3~ynh1", "url": "https://salsa.debian.org/debian/anarchism/", - "licence": "GPL-2.0-or-later", + "license": "GPL-2.0-or-later", "maintainer": { "name": "kay0u", "email": "pierre@kayou.io" @@ -48,6 +48,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If enabled, Anarchism will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Anarchism sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] From 6ce41ae3a7f17fb0070e82faf75fb1c3dd31c93c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 18:17:09 +0100 Subject: [PATCH 3/4] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1a9dfd2..13442e2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,7 +43,7 @@ fi # If this folder exists, delete the old version of anarchism, and replace it with the new way to installing it. if [ -d "/usr/share/doc/anarchism/html" ]; then - ynh_package_remove anarchism + ynh_remove_app_dependencies anarchism final_path=/var/www/$app ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi From 3d762ca62db7fc0df99defb4ec2f8e6637d51462 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Jan 2021 18:20:49 +0100 Subject: [PATCH 4/4] Small typos --- README.md | 5 ++--- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1b3f558..0b2600a 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ This is an anarchist FAQ. Its aim is to present what anarchism really stands for #### Multi-users support -Are LDAP and HTTP auth supported? **No** -Can the app be used by multiple users? **Yes** + * Are LDAP and HTTP auth supported? **No** + * Can the app be used by multiple users? **Yes** #### Supported architectures @@ -40,7 +40,6 @@ Can the app be used by multiple users? **Yes** ## Links * Report a bug: https://github.com/YunoHost-Apps/anarchism_ynh/issues - * App website: Link to the official website of this app * Upstream app repository: https://salsa.debian.org/debian/anarchism/ * YunoHost website: https://yunohost.org/ diff --git a/scripts/upgrade b/scripts/upgrade index 13442e2..2466371 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,7 +85,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config @@ -102,7 +102,7 @@ chown -R root: $final_path #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload