diff --git a/Scripts/ennstatus.service b/Scripts/ennstatus.service --- a/Scripts/ennstatus.service +++ b/Scripts/ennstatus.service @@ -3,9 +3,13 @@ Description=Ennstatus After=network.target [Service] -Type=oneshot -ExecStart=/opt/ennstatus/start.sh -RemainAfterExit=yes +Type=forking +PIDFile=/var/run/gunicorn/ennstatus.pid +EnvironmentFile=/etc/conf.d/ennstatus +User=$USER +Group=$GROUP +ExecStart=/opt/ennstatus/bin/gunicorn -w 4 --chdir ${WORKING_DIR} -y ${LISTEN_ADDRESS} ennstatus:create_app\(\) +PrivateTmp=true [Install] WantedBy=multi-user.target diff --git a/Scripts/init_script_gunicorn.sh b/Scripts/init_script_gunicorn.sh --- a/Scripts/init_script_gunicorn.sh +++ b/Scripts/init_script_gunicorn.sh @@ -5,7 +5,7 @@ DESC=ennstatus start () { . /var/www/enn.lu/ennstatus/bin/activate - gunicorn -w 4 --chdir /var/www/enn.lu/ennstatus/chroot/ -D -p /tmp/ennstatus.pid -u www-data -g www-data -e ENNSTATUS_SETTINGS=/var/www/enn.lu/ennstatus/chroot/config.py -b 127.0.0.1 ennstatus:app + gunicorn -w 4 --chdir /var/www/enn.lu/ennstatus/chroot/ -D -p /tmp/ennstatus.pid -u www-data -g www-data -b 127.0.0.1 ennstatus:create_app\(\) return }