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

Merge pull request #158 from Ddataa/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2023-02-10 16:12:38 +01:00 committed by GitHub
commit 100886097a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/config.js
View file

@ -324,5 +324,5 @@ module.exports = {
* such as Docker.
*
*/
installMethod: 'unspecified',
installMethod: 'yunohost',
};

3
scripts/install
View file

@ -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.

20
scripts/upgrade
View file

@ -105,7 +105,21 @@ chgrp -R www-data $final_path
#=================================================
# CREATE A 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
#=================================================