diff options
| -rw-r--r-- | parabolaweb-fcgi | 4 | ||||
| -rw-r--r-- | parabolaweb-update | 7 | ||||
| -rw-r--r-- | parabolaweb.conf | 1 | ||||
| -rw-r--r-- | parabolaweb.rc | 1 | ||||
| -rw-r--r-- | parabolaweb.service | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/parabolaweb-fcgi b/parabolaweb-fcgi index 3dec02e..e42aec3 100644 --- a/parabolaweb-fcgi +++ b/parabolaweb-fcgi @@ -3,9 +3,9 @@ set -e . /etc/conf.d/parabolaweb -[[ -e /srv/http/web/manage.py ]] +[[ -e ${WEBDIR}/manage.py ]] -sudo -u "${WEBUSER:-$USER}" python2 /srv/http/web/manage.py runfcgi \ +sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \ host=${HOST} \ port=${PORT} \ --settings=settings \ diff --git a/parabolaweb-update b/parabolaweb-update index e4d65c2..b8ac5bf 100644 --- a/parabolaweb-update +++ b/parabolaweb-update @@ -1,8 +1,11 @@ #!/bin/bash set -e -_install_dir=/srv/http -_gitname=web +. /etc/conf.d/parabolaweb + + +_install_dir=${WEBDIR%/*} +_gitname=${WEBDIR##*/} _gitroot=git://parabolagnulinux.org/parabolaweb.git _gitbranch=master diff --git a/parabolaweb.conf b/parabolaweb.conf index c53b19c..467e62e 100644 --- a/parabolaweb.conf +++ b/parabolaweb.conf @@ -1,3 +1,4 @@ HOST=127.0.0.1 PORT=8090 # 80 is nginx +WEBDIR=/srv/http/web WEBUSER=nobody diff --git a/parabolaweb.rc b/parabolaweb.rc index 087a3fc..5e310b0 100644 --- a/parabolaweb.rc +++ b/parabolaweb.rc @@ -8,6 +8,7 @@ PIDFILE=/run/web/parabolaweb.pid case $1 in start) stat_busy "Starting ParabolaWeb" + install -dm777 ${PIDFILE%/*} if parabolaweb-fcgi pidfile=${PIDFILE}; then add_daemon parabolaweb stat_done diff --git a/parabolaweb.service b/parabolaweb.service index 4c3fb8c..a59d585 100644 --- a/parabolaweb.service +++ b/parabolaweb.service @@ -5,8 +5,9 @@ Description=ParabolaWeb [Service] Type=forking -ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid PIDFile=/run/web/parabolaweb.pid +ExecStartPre=/usr/bin/install -dm777 /run/web +ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid [Install] WantedBy=multi-user.target |