From c150540feaaae0f5eb7624b79c3cc70d9b6c20a4 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 29 Jan 2019 23:45:23 +0100 Subject: [PATCH] update ldap script --- conf/init_calibre_db_ldap_settings | 2 +- scripts/install | 2 +- scripts/upgrade | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/init_calibre_db_ldap_settings b/conf/init_calibre_db_ldap_settings index 3e45426..d16c8e9 100644 --- a/conf/init_calibre_db_ldap_settings +++ b/conf/init_calibre_db_ldap_settings @@ -1,3 +1,3 @@ config_use_ldap=1, config_ldap_provider_url=\'localhost:389\', -config_ldap_dn=\'uid=%s,ou=users,dc=yunohost,dc=org\', \ No newline at end of file +config_ldap_dn=\'uid=%s,ou=users,dc=yunohost,dc=org\' \ No newline at end of file diff --git a/scripts/install b/scripts/install index e4c3a8a..2600de5 100755 --- a/scripts/install +++ b/scripts/install @@ -169,7 +169,7 @@ ynh_systemd_action -a stop #set database settings as per conf file -conf="\"UPDATE settings SET $(. <(echo -E echo $(<../conf/init_calibre_db_settings))) WHERE ID=1\"" +conf="\"UPDATE settings SET $(. <(echo -E echo $(<../conf/init_calibre_db_settings))) $(. <(echo -E echo $(<../conf/init_calibre_db_ldap_settings))) WHERE ID=1\"" eval sqlite3 $final_path/app.db "$conf" conf="\"UPDATE user SET $(. <(echo -E echo $(<../conf/init_calibre_db_user))) WHERE ID=1\"" diff --git a/scripts/upgrade b/scripts/upgrade index ddaeb37..6ba7e9d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,8 @@ ynh_multimedia_addaccess $app ynh_backup_if_checksum_is_different "$final_path/app.db" #set database settings as per conf file : restart server so that app.db is regenerated, then add new ldap settings -ynh_systemd_action -a restart -l "INFO in server: Starting Gevent server" +ynh_systemd_action -a stop +ynh_systemd_action -l "INFO in server: Starting Gevent server" conf="\"UPDATE settings SET $(. <(echo -E echo $(<../conf/init_calibre_db_ldap_settings))) WHERE ID=1\"" eval sqlite3 $final_path/app.db "$conf"