diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 72eb5cb..65cc108 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -67,12 +67,9 @@ echo "Handling asset at $asset_url" # Here we base the source file name upon a unique keyword in the assets url (admin vs. update) # Leave $src empty to ignore the asset case $asset_url in - *"admin"*) + *"baikal-"*".zip") src="app" ;; - *"update"*) - src="app-upgrade" - ;; *) src="" ;; diff --git a/conf/baikal.yaml b/conf/baikal.yaml index 1f2af32..5916a93 100644 --- a/conf/baikal.yaml +++ b/conf/baikal.yaml @@ -8,16 +8,16 @@ system: admin_passwordhash: __PASSWORD_HASH__ auth_realm: BaikalDAV base_uri: '__PATH__' -# Auth Backend LDAP-UserBind; LDAP URI + # Auth Backend LDAP-UserBind; LDAP URI dav_ldap_uri: 'ldap://127.0.0.1/' -# Auth Backend LDAP-UserBind; Template for userbind -# %n => username -# %u => user part of username when it is an email -# %u => domain part of username when it is an email + # Auth Backend LDAP-UserBind; Template for userbind + # %n => username + # %u => user part of username when it is an email + # %u => domain part of username when it is an email dav_ldap_dn_template: 'uid=%n,ou=users,dc=yunohost,dc=org' -# Auth Backend LDAP-UserBind; attribute for displayname + # Auth Backend LDAP-UserBind; attribute for displayname dav_ldap_displayname_attr: 'cn' -# Auth Backend LDAP-UserBind; attribute for email + # Auth Backend LDAP-UserBind; attribute for email dav_ldap_email_attr: 'mail' database: encryption_key: '__DESKEY__' diff --git a/scripts/actions/reset_admin_password b/scripts/actions/reset_admin_password index 5ba0a3d..9086523 100644 --- a/scripts/actions/reset_admin_password +++ b/scripts/actions/reset_admin_password @@ -43,12 +43,12 @@ ynh_script_progression --message="Changing the password..." --weight=1 bk_conf="${final_path}/config/baikal.yaml" -ynh_backup_if_checksum_is_different --file="${final_path}/config/baikal.yaml" +ynh_backup_if_checksum_is_different --file="$final_path/config/baikal.yaml" -ynh_replace_string --match_string="${password_hash_old}" --replace_string="${password_hash}" --target_file="$bk_conf" +ynh_replace_string --match_string="${password_hash_old}" --replace_string="${password_hash}" --target_file="$final_path/config/baikal.yaml" ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash -ynh_store_file_checksum --file="${final_path}/config/baikal.yaml" +ynh_store_file_checksum --file="$final_path/config/baikal.yaml" #================================================= # END OF SCRIPT