From 6f02cc7be3e16fa893156e9ee93e72e51dd62cf4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 31 Aug 2024 01:00:42 +0200 Subject: [PATCH 1/2] [autopatch] Automatic patch attempt for helpers 2.1 --- manifest.toml | 2 +- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 95dbdc1..1b8610b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://libreddit.spike.codes/" code = "https://github.com/spikecodes/libreddit" [integration] -yunohost = ">= 11.2.27" +yunohost = ">= 11.2.18" helpers_version = "2.1" architectures = ["amd64"] multi_instance = true diff --git a/scripts/install b/scripts/install index 8cbb255..712fa3b 100755 --- a/scripts/install +++ b/scripts/install @@ -38,7 +38,7 @@ chown $app:$app "$install_dir/redlib.conf" #================================================= ynh_script_progression "Starting $app's systemd service..." -ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index c99b967..7f8f64e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -24,14 +24,14 @@ systemctl enable $app.service --quiet yunohost service add $app --description="Alternative to Reddit" --log="/var/log/$app/$app.log" -ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --action="start" --log_path="systemd" #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= ynh_script_progression "Reloading NGINX web server and $app's service..." -ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --action="start" --log_path="systemd" ynh_systemctl --service=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index bde0b92..e725a16 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Stopping $app's systemd service..." -ynh_systemctl --service=$app --action="stop" --log_path="systemd" +ynh_systemctl --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -45,7 +45,7 @@ chown $app:$app "$install_dir/redlib.conf" #================================================= ynh_script_progression "Starting $app's systemd service..." -ynh_systemctl --service=$app --action="start" --log_path="systemd" +ynh_systemctl --action="start" --log_path="systemd" #================================================= # END OF SCRIPT From ab5b0a4d5d7d8d621778b4aba75f4c68f74ff7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 31 Aug 2024 16:04:22 +0200 Subject: [PATCH 2/2] cleaning --- manifest.toml | 4 ++-- scripts/backup | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1b8610b..52ce39f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://libreddit.spike.codes/" code = "https://github.com/spikecodes/libreddit" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = ["amd64"] multi_instance = true @@ -43,7 +43,7 @@ ram.runtime = "50M" extract = false in_subdir = false rename = "redlib" - autoupdate.strategy = "latest_github_tag" + #autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/backup b/scripts/backup index 4ed49b4..50e701d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -12,7 +12,7 @@ ynh_print_info "Declaring files to be backed up..." ynh_backup "$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"