YunoHost-Apps/zerobin_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/zerobin_ynh.git synced 2024-09-03 18:06:01 +02:00
Code Issues Activity Actions

[fix] incorrect merge

Browse source
This commit is contained in:
magikcypress 2017-05-20 20:28:11 +02:00
parent a48cd99113
commit d87789ffa5
No known key found for this signature in database
GPG key ID: 3B3C7CD61957AC9A
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/install
View file

@ -41,18 +41,10 @@ ynh_nginx_config
# Create the php-fpm pool config # Create the php-fpm pool config
ynh_fpm_config ynh_fpm_config
<<<<<<< HEAD
# If app is public, add url to SSOWat conf as skipped_uris # If app is public, add url to SSOWat conf as skipped_uris
if [[ $is_public -eq 1 ]]; then if [[ $is_public -eq 1 ]]; then
# unprotected_uris allows SSO credentials to be passed anyway. # unprotected_uris allows SSO credentials to be passed anyway.
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
=======
# Set ssowat config
ynh_app_setting_set $app is_public "$is_public"
if [ "$is_public" = "Yes" ];
then
ynh_app_setting_set $app unprotected_uris "/"
>>>>>>> ed68227b97ca7aa0f4e0d0f9450df936e867585f
fi fi
sudo systemctl reload nginx sudo systemctl reload nginx