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 #157 from Ddataa/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2023-02-10 11:39:03 +01:00 committed by GitHub
commit 071835f910
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/5.1.0.tar.gz
SOURCE_SUM=e8971f8a6439958e8328a8433a696e5ae3915740c5f93cfce9a13776edd83084
SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/5.2.1.tar.gz
SOURCE_SUM=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

2
conf/nginx.conf
View file

@ -1,5 +1,5 @@
set $main_domain "__DOMAIN__";
set $sandbox_domain "sandbox-__DOMAIN__";
set $sandbox_domain "__SANDBOXDOMAIN__";
set $allowed_origins "https://${sandbox_domain}";
set $api_domain "__DOMAIN__";
set $files_domain "__DOMAIN__";

27
scripts/install
View file

@ -69,7 +69,22 @@ ynh_app_setting_set --app=$app --key=porti --value=$porti
#=================================================
# 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
@ -177,12 +192,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
#=================================================
@ -217,7 +226,9 @@ ynh_script_progression --message="Sending a readme for the admin..." --weight=1
message="CryptPad was successfully installed :)
We have added a sandbox domain for you but you still need to configure your DNS and generate Let's Encrypt Certificates for it.
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.
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.

19
scripts/remove
View file

@ -67,12 +67,25 @@ ynh_remove_nodejs
#=================================================
# REMOVE SANDBOX DOMAIN
#=================================================
ynh_script_progression --message="Removing sandbox domain..." --weight=1
# We don't test that in CI
if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
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="Removing sandbox domain : $sandboxdomain" --weight=1
if yunohost domain list | grep -q $sandboxdomain
then #if domain exist we remove it
yunohost domain remove $sandboxdomain