1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/synapse-admin_ynh.git synced 2024-09-03 20:26:34 +02:00

Merge pull request #29 from YunoHost-Apps/testing

Fix removal of NGINX endpoint
This commit is contained in:
Éric Gaspar 2023-02-26 11:05:41 +01:00 committed by GitHub
commit 261f1b2491
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 12 deletions

View file

@ -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)*
@ -17,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

View file

@ -6,6 +6,7 @@ It shall NOT be edited by hand.
# Synapse Admin pour YunoHost
[![Niveau dinté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)*
@ -17,7 +18,7 @@ Si vous navez 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

2
doc/ADMIN.md Normal file
View file

@ -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.

View file

@ -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",

View file

@ -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
#=================================================

View file

@ -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