Revision d05904a2
Utilisation de la variable HTTPD_USER.
On réutilise la variable HTTPD_USER contenant le nom de l'utilisateur
utilisé par la distribution pour Apache au lieu de le hard-coder dans
les fichiers de configuration des IHMs.
Change-Id: Ib4141110e4dec1893e5acec139766218afb633a0
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/981
Reviewed-by: Thomas BURGUIERE <thomas.burguiere@c-s.fr>
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Makefile | ||
---|---|---|
1 | 1 |
NAME := vigiboard |
2 | 2 |
|
3 |
SUBST_FILES := deployment/logrotate.conf deployment/settings.ini \ |
|
4 |
deployment/vigiboard.conf deployment/vigiboard.wsgi |
|
3 |
SUBST_FILES := \ |
|
4 |
deployment/logrotate.conf \ |
|
5 |
deployment/settings.ini \ |
|
6 |
deployment/vigiboard.conf \ |
|
7 |
deployment/vigiboard.wsgi |
|
5 | 8 |
|
6 | 9 |
all: build |
7 | 10 |
build: $(SUBST_FILES) |
... | ... | |
13 | 16 |
|
14 | 17 |
deployment/%: deployment/%.in |
15 | 18 |
sed -e 's,@SYSCONFDIR@,$(SYSCONFDIR),g' \ |
16 |
-e 's,@LOCALSTATEDIR@,$(LOCALSTATEDIR),g' $^ > $@ |
|
19 |
-e 's,@HTTPD_USER@,$(HTTPD_USER),g' \ |
|
20 |
-e 's,@LOCALSTATEDIR@,$(LOCALSTATEDIR),g' $^ > $@ |
|
17 | 21 |
|
18 | 22 |
install: build install_python install_data |
19 | 23 |
install_pkg: build install_python_pkg install_data |
deployment/vigiboard.conf.in | ||
---|---|---|
7 | 7 |
WSGISocketPrefix /var/run/wsgi |
8 | 8 |
WSGIRestrictStdout off |
9 | 9 |
WSGIPassAuthorization on |
10 |
WSGIDaemonProcess vigiboard user=apache group=apache processes=4 threads=1
|
|
10 |
WSGIDaemonProcess vigiboard user=@HTTPD_USER@ group=@HTTPD_USER@ processes=4 threads=1
|
|
11 | 11 |
WSGIScriptAlias /vigilo/vigiboard "@SYSCONFDIR@/vigilo/vigiboard/vigiboard.wsgi" |
12 | 12 |
|
13 | 13 |
KeepAlive Off |
Also available in: Unified diff