Project

General

Profile

Revision 8d76ded8

ID8d76ded82903f32d3685e0bbadb6af8c2baf509b
Parent d6189fdc
Child 6df90afb

Added by Francois POIROTTE almost 9 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: I251a7374a0930244ea3aad1f73d2204d63bd27fa
Refs: #1510.
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/1924
Tested-by: Build system <>
Reviewed-by: Francois POIROTTE <>

View differences:

Makefile
41 41
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
42 42
	[ `id -u` -ne 0 ] || chown $(HTTPD_USER): $(DESTDIR)$(LOCALSTATEDIR)/log/vigilo/$(NAME)
43 43
	install -m 644 -p -D deployment/logrotate.conf $(DESTDIR)/etc/logrotate.d/$(PKGNAME)
44
	# Déplacement du app_cfg.py
45
	mv $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES` $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/
46
	ln -s $(SYSCONFDIR)/vigilo/$(NAME)/app_cfg.py $(DESTDIR)`grep '$(NAME)/config/app_cfg.py$$' INSTALLED_FILES`
47
	echo $(SYSCONFDIR)/vigilo/$(NAME)/app_cfg.py >> INSTALLED_FILES
44
	# Installation du app_cfg.py
45
	install -m 644 -p app_cfg.py $(DESTDIR)$(SYSCONFDIR)/vigilo/$(NAME)/
48 46
	# Cache
49 47
	mkdir -p $(DESTDIR)$(LOCALSTATEDIR)/cache/vigilo/sessions
50 48
	chmod 750 $(DESTDIR)$(LOCALSTATEDIR)/cache/vigilo/sessions

Also available in: Unified diff