From 9cb364ad51217c1eb0e7a620fac0ef2ab3532079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 20 Aug 2023 10:54:07 +0200 Subject: [PATCH 1/3] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index b3df4b6..d6e9c34 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,7 +124,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="config/baikal.yaml" + ynh_setup_source --dest_dir="$final_path" --keep="Specific config" fi chmod 750 "$final_path" From 2b36def25bdac02ac6f8f00389e6bb0f3374afa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 20 Aug 2023 10:59:40 +0200 Subject: [PATCH 2/3] fix --- actions.toml | 10 ----- check_process | 6 +++ manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/actions/reset_admin_password | 57 ---------------------------- 5 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 actions.toml delete mode 100644 scripts/actions/reset_admin_password diff --git a/actions.toml b/actions.toml deleted file mode 100644 index aa446e3..0000000 --- a/actions.toml +++ /dev/null @@ -1,10 +0,0 @@ -[reset_admin_password] -name = "Reset the admin password" -command = "/bin/bash scripts/actions/reset_admin_password" -accepted_return_codes = [0] -description = "Change the admin password of the app." - [reset_admin_password.arguments] - [reset_admin_password.arguments.password] - type = "password" - ask.en = "Set the password for the administration" - ask.fr = "Définissez le mot de passe pour l'administration" \ No newline at end of file diff --git a/check_process b/check_process index 9b1daae..2b928af 100644 --- a/check_process +++ b/check_process @@ -13,6 +13,8 @@ upgrade=1 #0.7.1~ynh2 upgrade=1 from_commit=7c074c7b18322cde08c4eb57ffbc5ae174b7ae65 + #0.9.3~ynh1 + upgrade=1 from_commit=330692e457ef2b475046d1724d3f198f007d5512 backup_restore=1 multi_instance=0 port_already_use=0 @@ -24,3 +26,7 @@ Notification=none ; commit=7c074c7b18322cde08c4eb57ffbc5ae174b7ae65 name=Testing #60 manifest_arg=domain=DOMAIN&path=PATH&password=mysecret& + ; commit=330692e457ef2b475046d1724d3f198f007d5512 + name=Testing #0.9.3~ynh1 + manifest_arg=domain=DOMAIN&path=PATH&password=mysecret& + diff --git a/manifest.json b/manifest.json index dc780f1..d1add2c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight CalDAV and CardDAV server", "fr": "Serveur CalDAV et CardDAV léger" }, - "version": "0.9.3~ynh1", + "version": "0.9.3~ynh2", "url": "https://sabre.io/baikal/", "upstream": { "license": "GPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 76bfd01..93474a7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ #================================================= # dependencies used by the app -YNH_PHP_VERSION=8.0 +YNH_PHP_VERSION=8.2 php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" diff --git a/scripts/actions/reset_admin_password b/scripts/actions/reset_admin_password deleted file mode 100644 index 9086523..0000000 --- a/scripts/actions/reset_admin_password +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source scripts/_common.sh -source /usr/share/yunohost/helpers - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -# Get password -password=${YNH_ACTION_PASSWORD} - -app=${YNH_APP_INSTANCE_NAME:-$YNH_APP_ID} -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -#================================================= -# CHECK IF ARGUMENTS ARE CORRECT -#================================================= - -#================================================= -# CHECK IF AN ACTION HAS TO BE DONE -#================================================= - -password_hash_old=$(ynh_app_setting_get --app=$app --key=password_hash) -password_hash=$(echo -n admin:BaikalDAV:$password | sha256sum | cut -d ' ' -f 1) -if [ $password_hash == $password_hash_old ] -then - ynh_die "This is the same password." 0 -fi - -#================================================= -# SPECIFIC ACTION -#================================================= -# CHANGE THE PASSWORD -#================================================= -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_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" - -#================================================= -# END OF SCRIPT -#================================================= - -ynh_script_progression --message="Execution completed" --last From 99f50752298c3fce005d44b774236d82b443a5ce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 20 Aug 2023 08:59:45 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7278a5..7c7c71e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Baïkal is a lightweight CalDAV+CardDAV server. It offers an extensive web inter Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, macOS, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself with Baïkal. -**Shipped version:** 0.9.3~ynh1 +**Shipped version:** 0.9.3~ynh2 **Demo:** https://demo.yunohost.org/baikal/admin/ diff --git a/README_fr.md b/README_fr.md index 744dd29..bb1c327 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Baïkal est un serveur léger CalDAV+CardDAV. Il offre une interface Web étendu Baïkal permet d'accéder de manière transparente à vos contacts et calendriers depuis n'importe quel appareil. Il est compatible avec iOS, macOS, DAVx5 sur Android, Mozilla Thunderbird et toutes les autres applications compatibles CalDAV et CardDAV. Protégez votre vie privée en hébergeant vous-même des calendriers et contacts avec Baïkal. -**Version incluse :** 0.9.3~ynh1 +**Version incluse :** 0.9.3~ynh2 **Démo :** https://demo.yunohost.org/baikal/admin/