From 9f1a71b08cd6c4f066b07183ac12008528f1422b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Jun 2022 19:09:44 +0200 Subject: [PATCH] Testing (#73) * 22.06 * Auto-update README * Update manifest.json * Fix Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 6 +++--- scripts/install | 3 ++- scripts/upgrade | 3 ++- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 070862b..659e269 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Multi-Lingual -**Shipped version:** 22.04.2~ynh2 +**Shipped version:** 22.06~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 8c27997..38e932e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Multi-Lingual -**Version incluse :** 22.04.2~ynh2 +**Version incluse :** 22.06~ynh1 **Démo :** https://demo.bookstackapp.com diff --git a/conf/app.src b/conf/app.src index 0974738..0b2bc4e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.04.2.tar.gz -SOURCE_SUM=649a422f95ecad47d430eea88ffa656bcd15debd864ea30d5cc9c8f9cc88ac9f +SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.06.tar.gz +SOURCE_SUM=1c8a8afee7df3e628ff83224bc62a7b5de69689fd67996cf0742e6220bd5e589 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0dc6777..4dd239d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Platform to create documentation/wiki content", "fr": "Plateforme pour créer du contenu de documentation/wiki" }, - "version": "22.04.2~ynh2", + "version": "22.06~ynh1", "url": "https://www.bookstackapp.com/", "upstream": { "license": "MIT", @@ -18,8 +18,8 @@ }, "license": "MIT", "maintainer": { - "name": "liberodark", - "email": "liberodark@gmail.com" + "name": "eric_G", + "email": "" }, "requirements": { "yunohost": ">= 4.3.0" diff --git a/scripts/install b/scripts/install index fe11fde..3a903ef 100644 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 app_url_domain="https://$domain${path_url%/}" ynh_add_config --template=../conf/.env.example --destination=$final_path/.env -chmod 600 $final_path/.env #================================================= # FINAL BOOKSTACK INSTALL @@ -142,6 +141,8 @@ popd chmod 755 $final_path chmod -R o-rwx $final_path chown -R $app:www-data $final_path + +chmod 600 $final_path/.env chown $app:$app $final_path/.env #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6a4d9b7..978de98 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,7 +143,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 app_url_domain="https://$domain${path_url%/}" ynh_add_config --template=../conf/.env.example --destination=$final_path/.env -chmod 600 $final_path/.env #================================================= # FINAL BOOKSTACK INSTALL @@ -161,6 +160,8 @@ popd chmod 755 $final_path chmod -R o-rwx $final_path chown -R $app:www-data $final_path + +chmod 600 $final_path/.env chown $app:$app $final_path/.env #=================================================