From 56c6ce70c5453d9e6db0c83ea275c2bd1ff70e2d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 16 Nov 2020 16:16:51 +0100 Subject: [PATCH 1/2] Use carton from debian's repositories to avoid inconsistencies if lutim is installed --- conf/cron_lufi | 8 ++++---- conf/systemd.service | 6 +++--- scripts/_common.sh | 2 +- scripts/install | 3 --- scripts/restore | 3 --- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/conf/cron_lufi b/conf/cron_lufi index 3da3cc4..adb3f63 100644 --- a/conf/cron_lufi +++ b/conf/cron_lufi @@ -1,11 +1,11 @@ # Génération des statistiques. Tous les jours, à 5h. -0 5 * * * __USER__ cd "__FINALPATH__" && /usr/local/bin/carton exec script/lufi cron stats +0 5 * * * __USER__ cd "__FINALPATH__" && /usr/bin/carton exec script/lufi cron stats # Suppression des adresses IP obsolètes. Tous les jours, à 6h. -0 6 * * * __USER__ cd "__FINALPATH__" && /usr/local/bin/carton exec script/lufi cron cleanbdd +0 6 * * * __USER__ cd "__FINALPATH__" && /usr/bin/carton exec script/lufi cron cleanbdd # Suppression des images dont le délai a expiré. Tous les jours, à 6h. -0 6 * * * __USER__ cd "__FINALPATH__" && /usr/local/bin/carton exec script/lufi cron cleanfiles +0 6 * * * __USER__ cd "__FINALPATH__" && /usr/bin/carton exec script/lufi cron cleanfiles # Vérification de l'occupation du dossier des images. Tous les jours, à 7h. -0 7 * * * __USER__ cd "__FINALPATH__" && /usr/local/bin/carton exec script/lufi cron watch +0 7 * * * __USER__ cd "__FINALPATH__" && /usr/bin/carton exec script/lufi cron watch diff --git a/conf/systemd.service b/conf/systemd.service index a9397f3..560d102 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,9 +10,9 @@ User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__ PIDFile=__FINALPATH__/script/hypnotoad.pid -ExecStart=/usr/local/bin/carton exec hypnotoad script/lufi -ExecStop=/usr/local/bin/carton exec hypnotoad -s script/lufi -ExecReload=/usr/local/bin/carton exec hypnotoad script/lufi +ExecStart=/usr/bin/carton exec hypnotoad script/lufi +ExecStop=/usr/bin/carton exec hypnotoad -s script/lufi +ExecReload=/usr/bin/carton exec hypnotoad script/lufi [Install] WantedBy=multi-user.target diff --git a/scripts/_common.sh b/scripts/_common.sh index 6042ab2..9977374 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="build-essential libssl-dev libio-socket-ssl-perl liblwp-protocol-https-perl libpq-dev postgresql cpanminus" +pkg_dependencies="build-essential libssl-dev libio-socket-ssl-perl liblwp-protocol-https-perl libpq-dev postgresql carton" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 9680758..623258b 100644 --- a/scripts/install +++ b/scripts/install @@ -88,9 +88,6 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies -# Install Carton -echo yes | cpanm Carton - #================================================= # CREATE A POSTGRESQL DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index bc340ba..72a4a6b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -86,9 +86,6 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -# Install Carton -echo yes | cpanm Carton - #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= From a802d1acc8610ec0cec2a48e1a9b61405b73808e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 16 Nov 2020 16:44:02 +0100 Subject: [PATCH 2/2] Bump version requirement to 4.0 because carton from Debian's repo before buster isn't great according to framasky --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 707e8a3..2cfac83 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "win10@tutanota.com, cyp@rouquin.me" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4.0" }, "multi_instance": true, "services": [