From d1764f47ab617ef66f7ed5144ab60b735ed7262e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:52:06 +0200 Subject: [PATCH] Testing (#132) * restart config panel * Update manifest.toml * Standard (#119) * fix * Update manifest.toml * Update manifest.toml * Update POST_INSTALL.md * Update POST_INSTALL_fr.md * fix * Update manifest.toml * Auto-update README * Update tests.toml * Update tests.toml * remove standard * Update manifest.toml * Auto-update README * Update tests.toml * Update manifest.toml * Update manifest.toml * Update install * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Upgrade to v23.6.2 (#128) * Upgrade to v23.6.2 * Auto-update README * Auto-update README * Update manifest.toml * Add maintenance * Update config_panel.toml * Update config * Update config_panel.toml * Update config * Update manifest.toml * Update config * Update config * fix * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot --- README.md | 2 +- README_fr.md | 2 +- ...ig_panel.toml => config_panel.toml.example | 9 +++++++ manifest.toml | 8 +++---- scripts/config | 24 +++++++++++++++++++ 5 files changed, 39 insertions(+), 6 deletions(-) rename config_panel.toml => config_panel.toml.example (85%) diff --git a/README.md b/README.md index d5967a6..05100a5 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.2~ynh1 +**Shipped version:** 23.06.2~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index ff20744..1da2ff4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.2~ynh1 +**Version incluse :** 23.06.2~ynh2 **Démo :** https://demo.bookstackapp.com diff --git a/config_panel.toml b/config_panel.toml.example similarity index 85% rename from config_panel.toml rename to config_panel.toml.example index 143cbd3..e7e457d 100644 --- a/config_panel.toml +++ b/config_panel.toml.example @@ -2,6 +2,15 @@ version = "1.0" [main] name = "BookStack configuration" +services = ["__APP__"] + + [main.maintenance_mode] + name = "Maintenance mode" + + [main.maintenance_mode.maintenance_mode] + ask = "Enable maintenance mode" + type = "boolean" + default = "0" [main.php_fpm_config] name = "PHP-FPM configuration" diff --git a/manifest.toml b/manifest.toml index 936d6a7..c51120d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.2~ynh1" +version = "23.06.2~ynh2" maintainers = ["eric_G"] @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -46,8 +46,8 @@ ram.runtime = "50M" default = "en" [install.init_main_permission] - help.en = "If enabled, BookStack will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + help.en = "Si défini sur visiteurs, BookStack will be accessible by people who do not have an account. This can be changed later via the webadmin." + help.fr = "Si visiteurs selectionné, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" diff --git a/scripts/config b/scripts/config index 91c2de7..c13b81b 100644 --- a/scripts/config +++ b/scripts/config @@ -22,6 +22,16 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) # SPECIFIC GETTERS FOR TOML SHORT KEY #================================================= +get__maintenance_mode() { + # Maintenance mode status + if [ -f $install_dir/.maintenance ] + then + echo "1" + else + echo "0" + fi +} + get__fpm_footprint() { # Free footprint value for php-fpm # Check if current_fpm_footprint is an integer @@ -49,6 +59,20 @@ get__free_footprint() { # SPECIFIC SETTERS FOR TOML SHORT KEYS #================================================= +set__maintenance_mode() { + if [ "$maintenance_mode" -eq "1" ]; then + # If maintenance_mode was set to 1, enable maintenance mode + (cd "$install_dir" && ynh_exec_as "$app" \ + echo "Site under maintenance." > .maintenance) + ynh_print_info "Maintenance mode disabled" + elif [ "$maintenance_mode" -eq "0" ]; then + # If maintenance_mode was set to 0, disable maintenance mode + ynh_secure_remove --file=$install_dir/.maintenance + ynh_print_info "Maintenance mode enabled" + fi + ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" +} + set__fpm_footprint() { if [ "$fpm_footprint" != "specific" ] then