From a584aeb7eb25b8305da55685f576076cf6b4136a Mon Sep 17 00:00:00 2001 From: Ilya Makarov Date: Wed, 26 Feb 2020 20:12:53 +0300 Subject: [PATCH] User lemur instead manage.py --- docker/entrypoint | 8 ++++---- docker/supervisor.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/entrypoint b/docker/entrypoint index 50df18dd..6ac17a7a 100644 --- a/docker/entrypoint +++ b/docker/entrypoint @@ -36,7 +36,7 @@ fi # fi echo " # Running init" -su lemur -s /bin/bash -c "cd /opt/lemur/lemur; python3 /opt/lemur/lemur/manage.py init -p ${LEMUR_ADMIN_PASSWORD}" +su lemur -s /bin/bash -c "cd /opt/lemur/lemur; lemur init -p ${LEMUR_ADMIN_PASSWORD}" echo " # Done" # echo "Creating user" @@ -49,9 +49,9 @@ cron_sync="${CRON_SYNC:-"*/15 * * * *"}" cron_revoked="${CRON_CHECK_REVOKED:-"0 22 * * *"}" echo " # Populating crontab" -echo "${cron_notify} python3 /opt/lemur/lemur/manage.py notify expirations" > /etc/crontabs/lemur -echo "${cron_sync} python3 /opt/lemur/lemur/manage.py source sync -s all" >> /etc/crontabs/lemur -echo "${cron_revoked} python3 /opt/lemur/lemur/manage.py certificate check_revoked" >> /etc/crontabs/lemur +echo "${cron_notify} lemur notify expirations" > /etc/crontabs/lemur +echo "${cron_sync} lemur source sync -s all" >> /etc/crontabs/lemur +echo "${cron_revoked} lemur certificate check_revoked" >> /etc/crontabs/lemur echo " # Done" exec "$@" diff --git a/docker/supervisor.conf b/docker/supervisor.conf index eedd5c16..ec4b221d 100644 --- a/docker/supervisor.conf +++ b/docker/supervisor.conf @@ -7,7 +7,7 @@ pidfile = /tmp/supervisord.pid [program:lemur] environment=LEMUR_CONF=/home/lemur/.lemur/lemur.conf.py -command=/usr/bin/python3 manage.py start -b 0.0.0.0:8000 +command=lemur start -b 0.0.0.0:8000 user=lemur directory=/opt/lemur/lemur stdout_logfile=/dev/stdout