From b35314e9caa0fa61f14048ad1d75295c2eecac39 Mon Sep 17 00:00:00 2001 From: mhfowler Date: Tue, 24 Aug 2021 11:45:31 +0200 Subject: [PATCH 1/3] Fix restore script by creating /var/log/ folder --- scripts/restore | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index 827cae0..61065cf 100755 --- a/scripts/restore +++ b/scripts/restore @@ -102,6 +102,14 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet +#================================================= +# RESTORE THE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 + +mkdir -p /var/log/$app +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -116,13 +124,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= From f7eeaa6efe84c9652f16ec53e4fd39445b64fa1e Mon Sep 17 00:00:00 2001 From: mhfowler Date: Tue, 24 Aug 2021 13:21:49 +0200 Subject: [PATCH 2/3] Bump version number to 1.5 --- manifest.json | 2 +- scripts/restore | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ca69adb..b871221 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline.", "fr": "" }, - "version": "1.4~ynh1", + "version": "1.5~ynh1", "url": "https://archivebox.io/", "upstream": { "license": "MIT", diff --git a/scripts/restore b/scripts/restore index 61065cf..037f392 100755 --- a/scripts/restore +++ b/scripts/restore @@ -120,8 +120,10 @@ yunohost service add $app --description="Self-hosted internet archiving" --log=" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression --message="Ensuring systemd log folder is restored..." --weight=1 +mkdir -p /var/log/$app +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" #================================================= From f3f85626f0eca63e8ba4c1eab8544d357483f727 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 24 Aug 2021 11:21:58 +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 d078387..df8f37f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A self-hosted internet archiving solution to collect, save, and view sites you want to preserve offline. -**Shipped version:** 1.4~ynh1 +**Shipped version:** 1.5~ynh1 **Demo:** https://archiveboxdemo.commoninternet.net diff --git a/README_fr.md b/README_fr.md index d30a727..cbf12d1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour -**Version incluse :** 1.4~ynh1 +**Version incluse :** 1.5~ynh1 **Démo :** https://archiveboxdemo.commoninternet.net