From 0e06956666fea6ef4b20596e067183e399945bab Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 19 Feb 2023 16:30:34 +0100 Subject: [PATCH 1/6] Fix removal of NGINX endpoint --- scripts/remove | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/remove b/scripts/remove index a50c97f..3661268 100644 --- a/scripts/remove +++ b/scripts/remove @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) synapse_app=$(ynh_app_setting_get --app=$app --key=synapse_app) -synapse_domain=$(ynh_app_setting_get --app=$synapse_app --key=synapse_domain) +synapse_domain=$(ynh_app_setting_get --app=$synapse_app --key=domain) #================================================= # STANDARD REMOVE @@ -72,13 +72,12 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5 +# Remove NGINX config that enabled /_synapse/admin endpoint +ynh_secure_remove --file="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" + # Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove NGINX config that enabled /_synapse/admin endpoint -ynh_secure_remove --file="/etc/nginx/conf.d/${synapse_domain}.d/synapse-admin.conf" -ynh_secure_remove --file="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" - #================================================= # GENERIC FINALIZATION #================================================= From 0028f1fc5079c57f5eefa34ebb9844a01296c744 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Feb 2023 15:30:48 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 95b2daa..cc4780e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse Admin for YunoHost [![Integration level](https://dash.yunohost.org/integration/synapse-admin.svg)](https://dash.yunohost.org/appci/app/synapse-admin) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse-admin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse-admin.maintain.svg) + [![Install Synapse Admin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse-admin) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 6f4cd53..6679aa0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Synapse Admin pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/synapse-admin.svg)](https://dash.yunohost.org/appci/app/synapse-admin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse-admin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse-admin.maintain.svg) + [![Installer Synapse Admin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse-admin) *[Read this readme in english.](./README.md)* From cdb53546076db44f0fee836151ab525b461360df Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 19 Feb 2023 16:44:35 +0100 Subject: [PATCH 3/6] Add ADMIN.md --- doc/ADMIN.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/ADMIN.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..8e4add4 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1,2 @@ +To log into Synapse Admin with your user, you need to ensure it is an admin of your Synapse server. +Check your Synapse app documentation to do so. From 0131bfe45cb8558a6c459d95db7218cbd60e20a9 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 19 Feb 2023 17:16:37 +0100 Subject: [PATCH 4/6] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 647fbc2..8d4101f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Admin UI for Synapse", "fr": "Admin UI pour Synapse" }, - "version": "0.8.5~ynh4", + "version": "0.8.5~ynh5", "url": "https://github.com/Awesome-Technologies/synapse-admin", "upstream": { "license": "Apache-2.0", From ce28d589284ab2cad14e1cca1788db90b4642fc5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Feb 2023 16:16:44 +0000 Subject: [PATCH 5/6] 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 cc4780e..6175b06 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Admin UI for Synapse -**Shipped version:** 0.8.5~ynh4 +**Shipped version:** 0.8.5~ynh5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6679aa0..414ea73 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Admin UI pour Synapse -**Version incluse :** 0.8.5~ynh4 +**Version incluse :** 0.8.5~ynh5 ## Captures d’écran From 71aa076bcbcffbdb5f1df2e26cf3c3763e377c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Feb 2023 09:03:32 +0100 Subject: [PATCH 6/6] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 36bdc56..3f070a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=160 - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep=".env" fi chmod 750 "$final_path" @@ -143,11 +143,11 @@ fi #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$final_path/.env" +#ynh_add_config --template="../conf/.env" --destination="$final_path/.env" -chown -R $app:www-data "$final_path" +#chown -R $app:www-data "$final_path" #================================================= # SETUP SYSTEMD