LEMONLDAP::NG : clean apache conf

build/lemonldap-ng/Makefile

@@ -45,9 +45,6 @@ REXAMPLESDIR=$(DESTDIR)$(EXAMPLESDIR)
 TOOLSDIR=$(LMPREFIX)tools/
 RTOOLSDIR=$(DESTDIR)$(TOOLSDIR)
 
-DOCDIR=$(DOCUMENTROOT)doc/
-RDOCDIR=$(DESTDIR)$(DOCDIR)
-
 # Handler dir
 HANDLERDIR=$(LMPREFIX)handler/
 RHANDLERDIR=$(DESTDIR)$(HANDLERDIR)
@@ -193,7 +190,7 @@ install_site:	install_manager_site install_portal_site install_handler_site inst
 	@perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)for_etc_hosts
 	#
 	@echo
-	@echo "LemonLDAP::NG example v${VERSION} is installed with these parameters:"
+	@echo "LemonLDAP::NG v${VERSION} is installed with these parameters:"
 	@echo "  - System configuration: ${CONFDIR}"
 	@echo "  - DNS domain (for cookies and virtual hosts): ${DNSDOMAIN}"
 	@echo "  - LDAP parameters:"
@@ -214,7 +211,7 @@ install_site:	install_manager_site install_portal_site install_handler_site inst
 	@echo "3 - Run 'make postconf' as root to update /etc/hosts" if your DNS service does not known auth.$(DNSDOMAIN) and manager.$(DNSDOMAIN)
 	@echo
 	@echo "4 - Use the manager at http://manager.${DNSDOMAIN}/ (after Apache restart) to modify LemonLDAP::NG configuration."
-	@echo "    Edit ${DESTPORTALDIR}apps/apps-list.xml to modify the menu."
+	@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 \
@@ -317,6 +314,7 @@ install_conf_dir:	install_sessions_dir
 	# Configuration files install
 	@install -v -d $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR)
 	@cp --remove-destination $(SRCCOMMONDIR)storage.conf $(RCONFDIR)
+	@perl -i -pe 's#^dirName = .*#dirName = $(RFILECONFIGDIR)#g' $(RCONFDIR)storage.conf
 	@cp _example/conf/lmConf-1 $(RFILECONFIGDIR)
 	@perl -000 -i -pe "s#^(globalStorageOptions\\n\\s+)'[^\\n]*?'\$$#\$${1}\'\\\$$data1 = {&39;Directory&39; => &39;$(APACHESESSIONFILEDIR)&39;,&39;LockDirectory&39; => &39;$(APACHESESSIONFILELOCKDIR)&39;};'#m" $(RFILECONFIGDIR)lmConf-1
 	@perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g;\

build/lemonldap-ng/_example/etc/apache.conf

@@ -43,8 +43,8 @@ LogLevel warn
     </Directory>
 
     # On-line documentation
-    Alias /docs/ __DOCDIR__/docs/
-    <Directory __DOCDIR__/docs/>
+    Alias /doc/ __DOCDIR__
+    <Directory __DOCDIR__>
 	Order deny,allow
 	Allow from all
     </Directory>
@@ -54,40 +54,7 @@ LogLevel warn
 # Application Test
 <VirtualHost *>
     ServerName test1.__DNSDOMAIN__
-
-    # SSO protection
-    PerlHeaderParserHandler My::Package
-
-    # DocumentRoot
-    DocumentRoot __TESTDIR__
-    <Directory __TESTDIR__>
-        Order deny,allow
-        Allow from all
-        Options +ExecCGI
-    </Directory>
-
-    # Configuration reload mechanism (only 1 per physical server is
-    # needed): choose your URL to avoid restarting Apache when
-    # configuration change
-    <Location /reload>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.0/8
-        PerlHeaderParserHandler My::Package->refresh
-    </Location>
-
-    # Uncomment this to activate status module
-    #<Location /status>
-    #    Order deny,allow
-    #    Deny from all
-    #    Allow from 127.0.0.0/8
-    #    PerlHeaderParserHandler My::Package->status
-    #</Location>
-
-</VirtualHost>
-
-<VirtualHost *>
-    ServerName test2.__DNSDOMAIN__
+    ServerAlias test2.__DNSDOMAIN__
 
     # SSO protection
     PerlHeaderParserHandler My::Package

build/lemonldap-ng/_example/etc/apache2.conf

@@ -45,8 +45,8 @@ LogLevel warn
     </Directory>
 
     # On-line documentation
-    Alias /docs/ __DOCDIR__/docs/
-    <Directory __DOCDIR__/docs/>
+    Alias /doc/ __DOCDIR__
+    <Directory __DOCDIR__>
 	Order deny,allow
 	Allow from all
     </Directory>
@@ -56,40 +56,7 @@ LogLevel warn
 # Application Test
 <VirtualHost *>
     ServerName test1.__DNSDOMAIN__
-
-    # SSO protection
-    PerlHeaderParserHandler My::Package
-
-    # DocumentRoot
-    DocumentRoot __TESTDIR__
-    <Directory __TESTDIR__>
-        Order deny,allow
-        Allow from all
-        Options +ExecCGI
-    </Directory>
-
-    # Configuration reload mechanism (only 1 per physical server is
-    # needed): choose your URL to avoid restarting Apache when
-    # configuration change
-    <Location /reload>
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.0/8
-        PerlHeaderParserHandler My::Package->refresh
-    </Location>
-
-    # Uncomment this to activate status module
-    #<Location /status>
-    #    Order deny,allow
-    #    Deny from all
-    #    Allow from 127.0.0.0/8
-    #    PerlHeaderParserHandler My::Package->status
-    #</Location>
-
-</VirtualHost>
-
-<VirtualHost *>
-    ServerName test2.__DNSDOMAIN__
+    ServerAlias test2.__DNSDOMAIN__
 
     # SSO protection
     PerlHeaderParserHandler My::Package

build/lemonldap-ng/_example/etc/apps-list.xml

@@ -39,7 +39,7 @@
 	<category name="Documentation">
 	<application id="localdoc">
 		<name>Local documentation</name>
-		<uri>http://manager.__DNSDOMAIN__/docs/</uri>
+		<uri>http://manager.__DNSDOMAIN__/doc/</uri>
 		<description>Documentation supplied with LemonLDAP::NG</description>
 		<logo>docs.png</logo>
 		<display>on</display>