Project

General

Profile

Revision d05904a2

IDd05904a274b57b908b3bbf884e5438c9fb543048
Parent d46296e1
Child de6c9a55

Added by Francois POIROTTE over 11 years ago

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 <>
Tested-by: Build system <>

View differences:

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

Also available in: Unified diff