mirror of
https://github.com/YunoHost-Apps/opensondage_ynh.git
synced 2024-09-03 19:46:28 +02:00
Merge branch 'testing' into package_upgrade
This commit is contained in:
commit
1933461111
2 changed files with 18 additions and 4 deletions
|
@ -166,8 +166,15 @@ ynh_script_progression --message="Configuring SSOwat..."
|
|||
if [ $is_public -eq 1 ]
|
||||
then
|
||||
ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
|
||||
|
||||
# Keep /admin private
|
||||
ynh_app_setting_set --app=$app --key=protected_uris --value="/admin"
|
||||
if [ "$path_url" == "/" ]; then
|
||||
# If the path is /, clear it to prevent any error with the regex.
|
||||
path_url=""
|
||||
fi
|
||||
# Modify the domain to be used in a regex
|
||||
domain_regex=$(echo "$domain" | sed 's@-@.@g')
|
||||
ynh_app_setting_set $app protected_regex "$domain_regex$path_url/admin/"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
@ -220,8 +220,15 @@ ynh_script_progression --message="Upgrading SSOwat configuration..."
|
|||
if [ $is_public -eq 1 ]
|
||||
then
|
||||
ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
|
||||
|
||||
# Keep /admin private
|
||||
ynh_app_setting_set --app=$app --key=protected_uris --value="/admin"
|
||||
if [ "$path_url" == "/" ]; then
|
||||
# If the path is /, clear it to prevent any error with the regex.
|
||||
path_url=""
|
||||
fi
|
||||
# Modify the domain to be used in a regex
|
||||
domain_regex=$(echo "$domain" | sed 's@-@.@g')
|
||||
ynh_app_setting_set $app protected_regex "$domain_regex$path_url/admin/"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
Loading…
Add table
Reference in a new issue