From 2a79a5c7c4148419d2a7eef11b5be2d4819f0d0b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 24 Mar 2020 18:38:07 +0100 Subject: [PATCH 1/3] admin user is an ldap user --- scripts/install | 3 +++ scripts/upgrade | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index 354f887..e3b4368 100644 --- a/scripts/install +++ b/scripts/install @@ -148,6 +148,9 @@ ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plu ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plugins SET value='onlogin' WHERE plugin='auth_ldap' AND (name='field_updatelocal_firstname' OR name='field_updatelocal_lastname' OR name='field_updatelocal_email');" ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plugins SET value='locked' WHERE plugin='auth_ldap' AND (name='field_lock_firstname' OR name='field_lock_lastname' OR name='field_lock_email');" +# The admin is an ldap user +ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_user SET auth='ldap' WHERE username='$admin';" + exec_as "$app" php$YNH_PHP_VERSION "$final_path/admin/cli/purge_caches.php" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8ef0ae2..3492317 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,6 +148,9 @@ ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plu ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plugins SET value='onlogin' WHERE plugin='auth_ldap' AND (name='field_updatelocal_firstname' OR name='field_updatelocal_lastname' OR name='field_updatelocal_email');" ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_config_plugins SET value='locked' WHERE plugin='auth_ldap' AND (name='field_lock_firstname' OR name='field_lock_lastname' OR name='field_lock_email');" +# The admin is an ldap user +ynh_psql_execute_as_root --database=$db_name --sql="UPDATE public.mdl_user SET auth='ldap' WHERE username='$admin';" + exec_as "$app" php$YNH_PHP_VERSION "$final_path/admin/cli/purge_caches.php" #================================================= From 6e57036c2f73bd60d56806c0b2b98756ba2d974f Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 24 Mar 2020 18:51:20 +0100 Subject: [PATCH 2/3] No more password --- manifest.json | 8 -------- scripts/install | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index 0850b4b..c843332 100644 --- a/manifest.json +++ b/manifest.json @@ -49,14 +49,6 @@ "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" }, "example": "johndoe" - }, - { - "name": "password", - "type": "password", - "ask": { - "en": "Choose a password for the administrator", - "fr": "Choisissez un mot de passe pour l'administrateur" - } }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index e3b4368..65c22ee 100644 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -51,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value=$password ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= @@ -128,6 +126,7 @@ chown -R "$app": "$final_path" ynh_script_progression --message="Configuring the application..." --weight=190 email=$(ynh_user_get_info $admin mail) +password=$(ynh_string_random --length=30) exec_as "$app" php$YNH_PHP_VERSION "$final_path/admin/cli/install.php" --wwwroot="https://$domain${path_url%/}" --dataroot=$data_path --dbtype='pgsql' --dbname=$db_name --dbuser=$db_name --dbpass=$db_pwd --adminuser=$admin --adminpass=$password --adminemail=$email --fullname="YunoHost" --shortname="YNH" --non-interactive --agree-license From f1c0a7f3fd0844b83a515ffdd2d2192ce4007b5b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 24 Mar 2020 18:51:30 +0100 Subject: [PATCH 3/3] update check_process --- check_process | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/check_process b/check_process index 5bfd6fd..1b6ea41 100644 --- a/check_process +++ b/check_process @@ -1,12 +1,8 @@ -# See here for more informations -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) path="/path" (PATH) + admin="john" (USER) is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 @@ -15,25 +11,14 @@ setup_nourl=0 setup_private=1 setup_public=1 - upgrade=0 - backup_restore=0 + upgrade=1 + backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 - change_url=0 + change_url=1 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# Level 4: - Level 4=0 -# Level 5: + # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email= Notification=none