mirror of
https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git
synced 2024-09-03 18:36:09 +02:00
Merge branch 'testing' into plugins-upgrade
This commit is contained in:
commit
620b03077b
3 changed files with 6 additions and 6 deletions
|
@ -302,7 +302,7 @@ if [ $is_public -eq 1 ]; then
|
|||
fi
|
||||
|
||||
# Only the admin can access the admin panel of the app (if the app has an admin panel)
|
||||
ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
|
||||
ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin --auth_header=false
|
||||
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
|
@ -342,7 +342,6 @@ else
|
|||
Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin."
|
||||
fi
|
||||
|
||||
ynh_print_OFF
|
||||
echo "$Informations
|
||||
You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json.
|
||||
|
||||
|
@ -352,7 +351,6 @@ You can also find some specific actions for this app by using the experimental a
|
|||
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
|
||||
ynh_print_ON
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
|
|
|
@ -191,14 +191,12 @@ else
|
|||
Informations="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin."
|
||||
fi
|
||||
|
||||
ynh_print_OFF
|
||||
echo "$Informations
|
||||
You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json.
|
||||
|
||||
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=restore
|
||||
ynh_print_ON
|
||||
|
||||
#=================================================
|
||||
# END OF SCRIPT
|
||||
|
|
|
@ -135,6 +135,10 @@ fi
|
|||
if ! ynh_permission_exists --permission="admin"; then
|
||||
# Create the required permissions
|
||||
ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
|
||||
else
|
||||
# Make sure the admin panel is not exposed to the SSO's authentication headers
|
||||
# AFAIK there is no helper to check if that flag is up or not, so let's force it.
|
||||
ynh_permission_url --permission="admin" --auth_header=false
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
Loading…
Add table
Reference in a new issue