From b5b229cd8650207de75c9a3a7325ab5af72660ac Mon Sep 17 00:00:00 2001 From: maniack Date: Sat, 7 Dec 2019 23:28:46 +0100 Subject: [PATCH] Fixes --- scripts/install | 12 ++++++------ scripts/upgrade | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 2d9e6ef..94e5cda 100644 --- a/scripts/install +++ b/scripts/install @@ -75,12 +75,6 @@ ynh_app_setting_set --app=$app --key=overwrite_credentials --value="1" ynh_app_setting_set --app=$app --key=overwrite_nginx --value="1" ynh_app_setting_set --app=$app --key=overwrite_systemd --value="1" -#================================================= -# ACTIVATE MAINTENANCE MODE -#================================================= - -ynh_maintenance_mode_ON - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -341,6 +335,9 @@ fi # SEND A README FOR THE ADMIN #================================================= +# Get main domain and buid the url of the admin panel of the app. +admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" + if [ $mypads -eq 1 ] then Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." @@ -356,6 +353,9 @@ Your credentials for the admin panel are: - login : $admin - password : $password +You can configure this app easily by using the experimental config-panel feature $admin_panel/config-panel. +You can also find some specific actions for this app by using the experimental action feature $admin_panel/actions. + If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install diff --git a/scripts/upgrade b/scripts/upgrade index 7944936..e15c693 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -411,6 +411,30 @@ ynh_script_progression --message="Disabling maintenance mode..." --weight=5 ynh_maintenance_mode_OFF +#================================================= +# SEND A README FOR THE ADMIN +#================================================= + +# Get main domain and buid the url of the admin panel of the app. +admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" + +if [ $mypads -eq 1 ] +then + Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." +else + Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin." +fi + +echo "$Informations +Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. + +You can configure this app easily by using the experimental config-panel feature $admin_panel/config-panel. +You can also find some specific actions for this app by using the experimental action feature $admin_panel/actions. + +If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send + +ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=upgrade + #================================================= # END OF SCRIPT #=================================================