From 5c943e503217c3d982997274a4513333dfc7bfc4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 11 Nov 2021 20:08:38 +0100 Subject: [PATCH 1/4] 3.4.14 --- .github/workflows/updater.sh | 5 +---- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 88338a3..e54f084 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -63,7 +63,7 @@ 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 - *".tar.gz"*) + "v"*".tar.gz"*) src="app" ;; esac @@ -116,9 +116,6 @@ done # GENERIC FINALIZATION #================================================= -# Install moreutils, needed for sponge -sudo apt-get install moreutils - # Replace new version in manifest echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json diff --git a/conf/app.src b/conf/app.src index d7f8169..e4a9f74 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/timvisee/send/archive/refs/tags/v3.4.13.tar.gz -SOURCE_SUM=6b4e072f23325edd47666bdc6edf0e428c5e4ced22d8a5d3ffa9ca12be63b7cb +SOURCE_URL=https://github.com/timvisee/send/archive/refs/tags/v3.4.14.tar.gz +SOURCE_SUM=8c0234aedf8a2a67ef0a8f3b3cb72635c77d6496b0dd680ec2e70ae2f6b86c4d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f424913..2c676d4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "File sharing which allows to send encrypted files", "fr": "Partage de fichiers qui permet d'envoyer des fichiers chiffrés" }, - "version": "3.4.13~ynh2", + "version": "3.4.14~ynh1", "url": "https://github.com/timvisee/send", "upstream": { "license": "MPL-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index afb7110..3dbfaac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=15 +nodejs_version=16 #================================================= # PERSONAL HELPERS From 518d1916c1da1ef00de2c924eef88ffec7e4cd4b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 11 Nov 2021 19:08:43 +0000 Subject: [PATCH 2/4] 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 4dedc5d..1470e54 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ A fork of Mozilla's Firefox Send. Mozilla discontinued Send, this fork is a comm Send is a file sharing experiment which allows you to send encrypted files to other users. -**Shipped version:** 3.4.13~ynh2 +**Shipped version:** 3.4.14~ynh1 **Demo:** https://send.vis.ee/ diff --git a/README_fr.md b/README_fr.md index c75d940..b94ac06 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Un fork du Firefox Send de Mozilla. Mozilla a arrêté Send, et ce fork est un e Send est une expérience de partage de fichiers qui permet d'envoyer des fichiers chiffrés à d'autres utilisateurs. -**Version incluse :** 3.4.13~ynh2 +**Version incluse :** 3.4.14~ynh1 **Démo :** https://send.vis.ee/ From d29b11e433c9223a97022104cd4b6882a33faca1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 11 Nov 2021 22:31:31 +0100 Subject: [PATCH 3/4] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3dbfaac..afb7110 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=16 +nodejs_version=15 #================================================= # PERSONAL HELPERS From eb7bd6cb64b6a705afc3ce5143376706c2636852 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 18 Nov 2021 18:59:50 +0100 Subject: [PATCH 4/4] Fix --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/backup | 6 +++++- scripts/install | 8 ++++++++ scripts/remove | 8 ++++++++ scripts/restore | 7 +++++++ scripts/upgrade | 8 ++++++++ 7 files changed, 38 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 2c676d4..f30842c 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index afb7110..3dbfaac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=15 +nodejs_version=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index d548f15..09a69f4 100644 --- a/scripts/backup +++ b/scripts/backup @@ -47,7 +47,11 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# SPECIFIC BACKUP +# BACKUP LOGROTATE +#================================================= + +ynh_backup --src_path="/etc/logrotate.d/$app" + #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/install b/scripts/install index 87d574d..f0d7fc4 100644 --- a/scripts/install +++ b/scripts/install @@ -142,6 +142,14 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 ynh_add_systemd_config +#================================================= +# SETUP LOGROTATE +#================================================= +ynh_script_progression --message="Configuring log rotation..." --weight=1 + +# Use logrotate to manage application logfile(s) +ynh_use_logrotate + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= diff --git a/scripts/remove b/scripts/remove index 7c05587..8426f89 100644 --- a/scripts/remove +++ b/scripts/remove @@ -41,6 +41,14 @@ ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_config +#================================================= +# REMOVE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Removing logrotate configuration..." --weight=1 + +# Remove the app-specific logrotate config +ynh_remove_logrotate + #================================================= # REMOVE DEPENDENCIES #================================================= diff --git a/scripts/restore b/scripts/restore index 79d1941..1911c37 100644 --- a/scripts/restore +++ b/scripts/restore @@ -85,6 +85,13 @@ 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 + +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 45d92eb..051eb59 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,6 +131,14 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 # Create a dedicated systemd config ynh_add_systemd_config +#================================================= +# SETUP LOGROTATE +#================================================= +ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 + +# Use logrotate to manage app-specific logfile(s) +ynh_use_logrotate --non-append + #================================================= # INTEGRATE SERVICE IN YUNOHOST #=================================================