From 68a5d52263e10ea460aa91a38cd34412d8501d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:23:32 +0200 Subject: [PATCH] Testing (#120) * 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 --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- config_panel.toml | 10 ---------- doc/POST_INSTALL.md | 4 +--- doc/POST_INSTALL_fr.md | 4 +--- manifest.toml | 13 ++++++++++++- scripts/install | 2 -- tests.toml | 12 ++++++++++++ 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index bc1cd4a..6d7d62c 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.05.2~ynh1 +**Shipped version:** 23.05.2~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 914b67f..b9ec898 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.05.2~ynh1 +**Version incluse :** 23.05.2~ynh2 **Démo :** https://demo.bookstackapp.com diff --git a/config_panel.toml b/config_panel.toml index 77de992..143cbd3 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -3,16 +3,6 @@ version = "1.0" [main] name = "BookStack configuration" - [main.auth_config] - name = "Authentication configuration" - - [main.auth_config.auth_method] - ask = "General authentication" - choices = ["standard", "ldap"] - default = "ldap" - help = "Select an authentication method to connect to BookStack." - bind = "AUTH_METHOD:/var/www/__APP__/.env" - [main.php_fpm_config] name = "PHP-FPM configuration" diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index c286b1c..e9ce5f7 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,5 +1,3 @@ BookStack uses LDAP authentication by default. -You can switch to standard authentication in the webadmin -> bookstack -> config panel setting. - -For the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. +If you choose Standard as authentication, for the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 6751601..4e3cb67 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,5 +1,3 @@ BookStack utilise l'authentification LDAP par défaut. -Vous pouvez passer à l'authentification standard dans le webadmin -> Bookstack -> paramètre du panneau de configuration. - -Pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. +Si vous avez choisi la méthode standard d'authentification, pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. diff --git a/manifest.toml b/manifest.toml index 5021fed..5322121 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.05.2~ynh1" +version = "23.05.2~ynh2" maintainers = ["eric_G"] @@ -38,6 +38,13 @@ ram.runtime = "50M" [install.admin] type = "user" + [install.auth_method] + ask.en = "Choose an authentication method" + ask.fr = "Choisissez une méthode d'authentification" + type = "string" + choices = ["standard", "ldap"] + default = "ldap" + [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" @@ -67,6 +74,10 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + api.url = "/api" + api.show_tile = false + api.allowed = "visitors" + api.auth_header = false [resources.apt] packages = "mariadb-server, php8.2-curl, php8.2-mysql, php8.2-ldap, php8.2-mbstring, php8.2-tidy, php8.2-xml, php8.2-zip, php8.2-gd" diff --git a/scripts/install b/scripts/install index eec4f89..40bff2c 100644 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,6 @@ timezone="$(cat /etc/timezone)" redis_db=$(ynh_redis_get_free_db) email=$(ynh_user_get_info --username=$admin --key=mail) -auth_method="ldap" fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" @@ -27,7 +26,6 @@ fpm_usage="low" #================================================= ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db -ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage diff --git a/tests.toml b/tests.toml index 205d217..cc09f90 100644 --- a/tests.toml +++ b/tests.toml @@ -6,6 +6,12 @@ test_format = 1.0 # Default args to use for install # ------------------------------- + args.auth_method = "ldap" + + # ------------------------------- + # Default args to use for install + # ------------------------------- + exclude = ["install.nourl"] # ------------------------------- @@ -13,3 +19,9 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.d653976.name = "Upgrade from 23.01" + +[standard_auth_method] + + only = ["install.subdir", "backup_restore", "upgrade"] + + args.auth_method = "standard"