diff --git a/conf/config.js b/conf/config.js index 41b1075..5488347 100644 --- a/conf/config.js +++ b/conf/config.js @@ -324,5 +324,5 @@ module.exports = { * such as Docker. * */ - installMethod: 'unspecified', + installMethod: 'yunohost', }; diff --git a/scripts/install b/scripts/install index 51dd891..f3fcddf 100644 --- a/scripts/install +++ b/scripts/install @@ -228,7 +228,8 @@ message="CryptPad was successfully installed :) READ CAREFULLY !! -We have added a sandbox domain : $sandboxdomain for you but you still need to configure your DNS and generate Let's Encrypt Certificates for it. +We have added a sandbox domain : $sandboxdomain for you but you still need to configure your DNS and generate the Let's Encrypt Certificates for it. +You will need also to restart CryptPad service after this is done. Then you can please open your $app domain: https://$domain$path_url Once CryptPad is installed, create an account via the Sign Up button on the home page which will take you to the Register page. diff --git a/scripts/upgrade b/scripts/upgrade index 5aa6ad9..2d0e277 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -105,7 +105,21 @@ chgrp -R www-data $final_path #================================================= # CREATE A SANDBOX DOMAIN #================================================= -sandboxdomain=sandbox-$domain +# if the main domain for the app is a root domain, we create a correct sandbox subdomain +if [[ $domain == *"."* ]]; then + sandboxdomain=sandbox.$domain +fi +# if the main domain for the app is already a sub-domain, we create a correct sandbox domain +if [[ $domain == *"."*"."* ]]; then + sandboxdomain=sandbox-$domain +fi +# if the main domain for the app is a .local root domain, we create a correct sandbox subdomain +if [[ $domain == *".local" ]]; then + sandboxdomain=sandbox-$domain +fi + +ynh_script_progression --message="Setting up sandobx domain : $sandboxdomain" --weight=1 + # We don't test that in CI if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then yunohost domain add $sandboxdomain @@ -182,12 +196,6 @@ fi # 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 - # there is a bug in core that add a slash at the end of domain in ssowat conf for uris var - # so we use ${sandboxdomain%/} to remove the eccessive trailing slash # it doesnt work - # we use jq to correct /etc/ssowat/conf.json - uri2=$sandboxdomain - touch /etc/ssowat/conf.json.persistent - cat /etc/ssowat/conf.json | jq --arg uri2 "$uri2" '(.permissions[] | select(.label=="CryptPad") | .uris[1]) |=$uri2' >> /etc/ssowat/conf.json.persistent fi #=================================================