35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
Index: Makefile
|
|
===================================================================
|
|
--- Makefile (revision 498)
|
|
+++ Makefile (working copy)
|
|
@@ -246,7 +246,7 @@
|
|
@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
|
|
@@ -308,7 +308,8 @@
|
|
@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
|
|
+ @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)
|
|
|
|
Index: lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d
|
|
===================================================================
|
|
--- lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d (revision 498)
|
|
+++ lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d (working copy)
|
|
@@ -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
|