From b94ef4c92709d4e624b2c73d884674d9953869c2 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 16 Nov 2020 16:32:51 +0100 Subject: [PATCH] Use carton from debian's repositories --- conf/lstu-minion@.service | 2 +- conf/systemd.service | 6 +++--- scripts/_common.sh | 2 +- scripts/install | 3 --- scripts/restore | 3 --- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/conf/lstu-minion@.service b/conf/lstu-minion@.service index e0c001d..7363924 100644 --- a/conf/lstu-minion@.service +++ b/conf/lstu-minion@.service @@ -6,7 +6,7 @@ Documentation=https://framagit.org/luc/lstu Type=forking User=www-data WorkingDirectory=__FINALPATH__ -ExecStart=/usr/local/bin/carton exec script/application minion worker +ExecStart=/usr/bin/carton exec script/application minion worker [Install] WantedBy=multi-user.target diff --git a/conf/systemd.service b/conf/systemd.service index 5cbd244..b499d7f 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,9 +11,9 @@ Restart=always RestartSec=10 WorkingDirectory=__FINALPATH__ PIDFile=__FINALPATH__/script/hypnotoad.pid -ExecStart=/usr/local/bin/carton exec hypnotoad script/lstu -ExecStop=/usr/local/bin/carton exec hypnotoad -s script/lstu -ExecReload=/usr/local/bin/carton exec hypnotoad script/lstu +ExecStart=/usr/bin/carton exec hypnotoad script/lstu +ExecStop=/usr/bin/carton exec hypnotoad -s script/lstu +ExecReload=/usr/bin/carton exec hypnotoad script/lstu [Install] WantedBy=multi-user.target diff --git a/scripts/_common.sh b/scripts/_common.sh index 50159c9..95b18ef 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="build-essential libssl-dev zlib1g-dev libpng-dev libpq-dev memcached postgresql cpanminus" +pkg_dependencies="build-essential libssl-dev zlib1g-dev libpng-dev libpq-dev memcached postgresql carton" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index e987a8f..d13242e 100644 --- a/scripts/install +++ b/scripts/install @@ -74,9 +74,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 98e822c..2b7145f 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 #=================================================