From 8892ac39d8db8edb6e9f2a415b7acf0572f99f12 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Mon, 31 Oct 2022 16:29:33 +0100 Subject: [PATCH] Update install --- scripts/install | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 6c7ab56..885830b 100644 --- a/scripts/install +++ b/scripts/install @@ -51,15 +51,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -#================================================= -# CHECK IF THE SANDBOX DOMAIN IS ALREADY SETUP WITH CORRECT CERTIFICATE -#================================================= -# We don't test that in CI -#if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then -# if ! yunohost domain cert status $domain | grep -q "summary: Great!"; then -# ynh_die "The domain $domain does not have correct Let's Encrypt certificates !" -#fi fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -180,6 +171,7 @@ then ynh_permission_update --permission="main" --add="visitors" fi +# We authorize access to sandbox domain # We don't test that in CI if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then ynh_permission_url --permission="main" --add_url=$sandboxdomain --auth_header=true @@ -188,12 +180,13 @@ if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then # we use jq to correct /etc/ssowat/conf.json uri1=$domain uri2=$sandboxdomain + app=$app #we delete the uris from cryptpad.main - cat /etc/ssowat/conf.json | jq 'del(.permissions[] | select(.label=="CryptPad") | .uris)' + cat /etc/ssowat/conf.json | jq 'del(.permissions[] | select(.label=="$app") | .uris)' #we write them again - cat /etc/ssowat/conf.json | jq --arg uri1 "$uri1" '(.permissions[] | select(.label=="CryptPad") | .uris[0]) |=$uri1' - cat /etc/ssowat/conf.json | jq --arg uri2 "$uri2" '(.permissions[] | select(.label=="CryptPad") | .uris[1]) |=$uri2' > /etc/ssowat/tmp.conf.json + cat /etc/ssowat/conf.json | jq --arg uri1 "$uri1" '(.permissions[] | select(.label=="$app") | .uris[0]) |=$uri1' + cat /etc/ssowat/conf.json | jq --arg uri2 "$uri2" '(.permissions[] | select(.label=="$app") | .uris[1]) |=$uri2' > /etc/ssowat/tmp.conf.json rm /etc/ssowat/conf.json mv /etc/ssowat/tmp.conf.json /etc/ssowat/conf.json fi