diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/parabolaweb-utils/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/parabolaweb-utils/parabolaweb-fcgi | 4 | ||||
-rw-r--r-- | libre/parabolaweb-utils/parabolaweb-update | 7 | ||||
-rw-r--r-- | libre/parabolaweb-utils/parabolaweb.conf | 1 | ||||
-rw-r--r-- | libre/parabolaweb-utils/parabolaweb.rc | 1 | ||||
-rw-r--r-- | libre/parabolaweb-utils/parabolaweb.service | 5 |
6 files changed, 22 insertions, 8 deletions
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index cfb39d703..9c6da333a 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -8,12 +8,18 @@ pkgname=parabolaweb-utils pkgver=`_get_pkgver` -pkgrel=2 +pkgrel=3 pkgdesc="Utils for the Parabola website" arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" license=('GPL2') -depends=('python2' 'python2-flup' 'git' 'libretools' `_get_depends`) +depends=( + 'python2' # duh + 'python2-flup' # for fcgi + 'postgresql' # for database + 'git' # used in parabolaweb-update + 'libretools' # used in parabolaweb-update + `_get_depends`) backup=('etc/conf.d/parabolaweb') export pkgver @@ -42,5 +48,5 @@ md5sums=('SKIP' 'dd05d6a4ea7cff7fdd789f59aeb9059a' '520e20b8bbca64042b3afa76b0bec55f' '1bce8fb832ad9e61cf8b96426ce843b5' - 'c7e292d2d1c3e846e5cfcd7283de0fe4' + '80ee438224b4d67677d0980d5bc57005' 'fb291168d3f57a85f82216c4e74c9ccf') diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi index 3dec02e10..e42aec3cd 100644 --- a/libre/parabolaweb-utils/parabolaweb-fcgi +++ b/libre/parabolaweb-utils/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/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update index e4d65c2d9..b8ac5bf5e 100644 --- a/libre/parabolaweb-utils/parabolaweb-update +++ b/libre/parabolaweb-utils/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/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf index c53b19cb8..467e62e2c 100644 --- a/libre/parabolaweb-utils/parabolaweb.conf +++ b/libre/parabolaweb-utils/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/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc index 087a3fcb0..5e310b01d 100644 --- a/libre/parabolaweb-utils/parabolaweb.rc +++ b/libre/parabolaweb-utils/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/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service index d145e53d8..a59d58512 100644 --- a/libre/parabolaweb-utils/parabolaweb.service +++ b/libre/parabolaweb-utils/parabolaweb.service @@ -1,10 +1,13 @@ [Unit] +Requires=postgresql.service +After=postgresql.service 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 |