diff --git a/config_panel.toml b/config_panel.toml index e10ea28..143cbd3 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,17 +2,6 @@ version = "1.0" [main] name = "BookStack configuration" -services = ["__APP__"] - - [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..f3a33e2 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,5 +1,2 @@ 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..bed1acd 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,5 +1,2 @@ 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 a44a548..0cee4b5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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" 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