Project

General

Profile

Revision b82c4c03

IDb82c4c03d09c8b7e46f2b6aeb716385a14c373ff
Parent 7bde24ad
Child fbbf34f8

Added by Francois POIROTTE over 8 years ago

[#1510] Chargement plus générique de l'application

Rend plus générique le chargement des IHMs :
- Le dossier de surcharge (public/) est pris à partir de l'emplacement
du fichier settings.ini plutôt que hard-codé.
- Idem pour le fichier app_cfg.py.

Ces modifications permettent d'héberger plusieurs instances de VigiMap
conjointement sur la même machine (par exemple, pour PreludeMap).

Change-Id: Iaf43087160023a7eda95c3d366a336ba17e0b93f
Refs: #1510.
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/1926
Tested-by: Build system <>
Reviewed-by: Francois POIROTTE <>

View differences:

Makefile
49 49
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
50 50
	[ `id -u` -ne 0 ] || chown $(HTTPD_USER): $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
51 51
	install -m 644 -p -D deployment/logrotate.conf $(DESTDIR)/etc/logrotate.d/$(PKGNAME)
52
	# Déplacement du app_cfg.py
53
	mv $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES` $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/
54
	ln -s $(SYSCONFDIR)/vigilo/$(NAME)/app_cfg.py $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES`
55
	echo $(SYSCONFDIR)/vigilo/$(NAME)/app_cfg.py >> INSTALLED_FILES
52
	# Installation du app_cfg.py
53
	install -m 644 -p app_cfg.py $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/
56 54
	# Cache
57 55
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/cache/vigilo/sessions
58 56
	chmod 750 $(DESTDIR)$(LOCALSTATEDIR)/cache/vigilo/sessions

Also available in: Unified diff