diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile index bf164a827..d98549db0 100644 --- a/build/lemonldap-ng/Makefile +++ b/build/lemonldap-ng/Makefile @@ -248,7 +248,7 @@ install_site: install_manager_site install_portal_site install_handler_site inst @echo " Edit ${RCONFDIR}/apps/apps-list.xml to modify the menu." @echo @echo "5 - Try to connect to http://test1.${DNSDOMAIN}/ or http://test2.${DNSDOMAIN}/" - @if [ "$(APACHEUSER)" == "" ]; then \ + @if [ ! "$(APACHEUSER)" ]; then \ echo;echo " Warning, since APACHEUSER was not set, $(APACHESESSIONFILEDIR) and $(CONFDIR) have permissive permissions."; \ echo " Fix them by yourself to restrict their view to apache process only"; \ fi @@ -310,7 +310,9 @@ install_portal_site: install_conf_dir @cp -pR --remove-destination ${SRCPORTALDIR}/example/AuthLA/* $(RLASPPORTALDIR) @perl -i -pe 's#__DIR__#$(LASPPORTALDIR)/#g' $(RLASPPORTALDIR)/index.pl # Cron files - @cp --remove-destination lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d $(RCRONDIR) + @cp --remove-destination lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d $(RCRONDIR)/lemonldap-ng + @if [ ! "$(APACHEUSER)" ]; then APACHEUSER="root"; fi + @perl -i -pe 's#__APACHEUSER__#$(APACHEUSER)#g; s#__BINDIR__#$(BINDIR)#g;' $(RCRONDIR)/lemonldap-ng # Clean SVN files @rm -rf $$(find ${RPORTALDIR} $(RPORTALSKINSDIR) $(RLASPPORTALDIR) $(RCRONDIR) $(RCONFDIR) -type d -name .svn) diff --git a/modules/lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d b/modules/lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d index 6406c66b0..7e7ce5e8c 100644 --- a/modules/lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d +++ b/modules/lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d @@ -1,4 +1,4 @@ # -# Regular cron jobs for the Lemonldap::NG portal +# Regular cron jobs for LemonLDAP::NG # -*/10 * * * * www-data test -x /usr/share/lemonldap-ng/bin/purgeCentralCache +*/10 * * * * __APACHEUSER__ [ -x __BINDIR__/purgeCentralCache ] && __BINDIR__/purgeCentralCache