From dc63f831287a10aa3551f265149c6b6e82bd1588 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Mon, 1 Jun 2015 11:01:16 +0000 Subject: [PATCH] Replace __MGR*__ by godd values --- Makefile | 2 ++ lemonldap-ng-common/lemonldap-ng.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 52041225a..4a0db98d3 100644 --- a/Makefile +++ b/Makefile @@ -328,6 +328,8 @@ install_manager_site: install_conf_dir # Clean svn files @rm -rf $$(find ${RMANAGERDIR} ${RMANAGERSTATICDIR} $(RMANAGERPSGIDIR) \ $(RMANAGERTEMPLATESDIR) $(RCONFDIR) -type d -name .svn) + $(PERL) -i -pe 's/__MANAGERSTATICDIR__/$(MANAGERSTATICDIR)/g' $(RCONFDIR)/$(CONFFILENAME) + $(PERL) -i -pe 's/__MANAGERTEMPLATESDIR__/$(MANAGERTEMPLATESDIR)/g' $(RCONFDIR)/$(CONFFILENAME) install_portal_site: install_conf_dir # Portal install diff --git a/lemonldap-ng-common/lemonldap-ng.ini b/lemonldap-ng-common/lemonldap-ng.ini index a845cecb2..1f0156d7b 100644 --- a/lemonldap-ng-common/lemonldap-ng.ini +++ b/lemonldap-ng-common/lemonldap-ng.ini @@ -272,7 +272,7 @@ protection = manager logLevel = warn ; staticPrefix: relative (or URL) location of static HTML components -staticPrefix = __MANAGERSTATICPREFIX__ +staticPrefix = __MANAGERSTATICDIR__ ; ; location of HTML templates directory templateDir = __MANAGERTEMPLATESDIR__