YunoHost-Apps/opensondage_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/opensondage_ynh.git synced 2024-09-03 19:46:28 +02:00
Code Issues Activity Actions

Fix the regex

Browse source
This commit is contained in:
Kay0u 2019-03-28 15:37:23 +01:00
parent ec53481d68
commit 5d3d2ff67d
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/install
View file

@ -183,7 +183,15 @@ if [ $is_public -eq 0 ];
then then
ynh_app_setting_set "$app" protected_uris "/" ynh_app_setting_set "$app" protected_uris "/"
else else
ynh_app_setting_set "$app" protected_regex "/admin/" # If the app is private, viewing images stays publicly accessible.
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/"
ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf"
ynh_store_file_checksum "$finalnginxconf" ynh_store_file_checksum "$finalnginxconf"

10
scripts/upgrade
View file

@ -212,7 +212,15 @@ then
ynh_app_setting_set "$app" protected_uris "/" ynh_app_setting_set "$app" protected_uris "/"
else else
ynh_app_setting_delete "$app" protected_uris ynh_app_setting_delete "$app" protected_uris
ynh_app_setting_set "$app" protected_regex "/admin/"
# If the app is private, viewing images stays publicly accessible.
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/"
ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf" ynh_replace_string " include conf.d/" " #include conf.d/" "$finalnginxconf"