From 7a9edab0584632228ea987f69453407607943758 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 19 Nov 2020 18:30:22 +0100 Subject: [PATCH] debian: restore use of launch-authentic2.sh in authentic2 package (#48701) --- debian/authentic2.init | 2 +- debian/authentic2.service | 2 +- debian/launch-authentic2.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/authentic2.init b/debian/authentic2.init index b904bca0..560fb97d 100644 --- a/debian/authentic2.init +++ b/debian/authentic2.init @@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC=authentic2 NAME=authentic2 -DAEMON=/usr/bin/uwsgi +DAEMON=/usr/lib/authentic2/launch-authentic2.sh RUN_DIR=/run/$NAME PIDFILE=$RUN_DIR/$NAME.pid LOG_DIR=/var/log/$NAME diff --git a/debian/authentic2.service b/debian/authentic2.service index 514f5099..8ee92b22 100644 --- a/debian/authentic2.service +++ b/debian/authentic2.service @@ -10,7 +10,7 @@ User=authentic2 Group=authentic2 ExecStartPre=/usr/bin/authentic2-manage migrate --noinput ExecStartPre=/usr/bin/authentic2-manage collectstatic --noinput -ExecStart=/usr/bin/uwsgi --ini /etc/%p/%p-uwsgi.ini +ExecStart=/usr/lib/authentic2/launch-authentic2.sh --ini /etc/%p/%p-uwsgi.ini ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGQUIT TimeoutStartSec=0 diff --git a/debian/launch-authentic2.sh b/debian/launch-authentic2.sh index 03c12786..24bdd05d 100755 --- a/debian/launch-authentic2.sh +++ b/debian/launch-authentic2.sh @@ -12,4 +12,4 @@ if [ -f /etc/authentic2/authentic.conf ]; then . /etc/authentic2/authentic.conf fi -/usr/bin/gunicorn3 "$@" +/usr/bin/uwsgi "$@" -- 2.29.2