From 6dd9ba2f6ab24f3e4099aeadc0ecdbb97e9c4b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 15:26:12 +0200 Subject: [PATCH] Testing (#122) * 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 --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/.env.example | 2 +- doc/POST_INSTALL.md | 3 --- doc/POST_INSTALL_fr.md | 3 --- manifest.toml | 9 +-------- scripts/upgrade | 6 ------ tests.toml | 17 ----------------- 8 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 doc/POST_INSTALL.md delete mode 100644 doc/POST_INSTALL_fr.md diff --git a/README.md b/README.md index 6d7d62c..d125b25 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~ynh2 +**Shipped version:** 23.05.2~ynh3 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index b9ec898..dd87429 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~ynh2 +**Version incluse :** 23.05.2~ynh3 **Démo :** https://demo.bookstackapp.com diff --git a/conf/.env.example b/conf/.env.example index a0f8a59..f98ee6e 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -57,7 +57,7 @@ MAIL_PASSWORD=null MAIL_ENCRYPTION=null # General auth -AUTH_METHOD=__AUTH_METHOD__ +AUTH_METHOD=ldap # LDAP authentication configuration # Refer to https://www.bookstackapp.com/docs/admin/ldap-auth/ diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md deleted file mode 100644 index e9ce5f7..0000000 --- a/doc/POST_INSTALL.md +++ /dev/null @@ -1,3 +0,0 @@ -BookStack uses LDAP authentication by default. - -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 deleted file mode 100644 index 4e3cb67..0000000 --- a/doc/POST_INSTALL_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -BookStack utilise l'authentification LDAP par défaut. - -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 5322121..84a5283 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~ynh2" +version = "23.05.2~ynh3" maintainers = ["eric_G"] @@ -38,13 +38,6 @@ 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" diff --git a/scripts/upgrade b/scripts/upgrade index 397512a..4602a18 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,12 +38,6 @@ if [ -z "${fpm_usage:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# If auth_method doesn't exist, create it -if [ -z "${auth_method:-}" ]; then - auth_method="standard" - ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/tests.toml b/tests.toml index cc09f90..96a81d2 100644 --- a/tests.toml +++ b/tests.toml @@ -6,22 +6,5 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - args.auth_method = "ldap" - - # ------------------------------- - # Default args to use for install - # ------------------------------- - exclude = ["install.nourl"] - # ------------------------------- - # Commits to test upgrade from - # ------------------------------- - - test_upgrade_from.d653976.name = "Upgrade from 23.01" - -[standard_auth_method] - - only = ["install.subdir", "backup_restore", "upgrade"] - - args.auth_method = "standard"