From e54b5b7e21b072f9803096f13c1572bd48f9a54c Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Thu, 21 Dec 2023 17:00:39 +0200 Subject: [PATCH 1/2] minor --- manifest.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index fc50aff..1c5388a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -3,9 +3,7 @@ packaging_format = 2 id = "cjdns" name = "Cjdns" description = "Cjdns encrypted IPv6 network" - version = "22.7" - maintainers = ["dkoukoul"] [upstream] From f01493f34d51032ff4d65668203754beef7ca9bb Mon Sep 17 00:00:00 2001 From: dkoukoul Date: Thu, 21 Dec 2023 17:55:08 +0200 Subject: [PATCH 2/2] fix scripts --- scripts/backup | 15 --------------- scripts/restore | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/scripts/backup b/scripts/backup index 968ad50..cbdac6b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,21 +21,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -# Only relevant if there is a "data_dir" resource for this app -ynh_backup --src_path="$data_dir" --is_big - -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/restore b/scripts/restore index be7373e..6b548fe 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,16 +39,14 @@ chown -R $app:www-data "$data_dir" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" +yunohost service add $app --description="$app service" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION #================================================= # Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT