From 814857937bb0994b73aed9f82b1ca91db98117db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= Date: Thu, 25 Dec 2008 18:48:50 +0000 Subject: [PATCH] LEMONLDAP::NG : clean apache conf --- build/lemonldap-ng/Makefile | 8 ++-- build/lemonldap-ng/_example/etc/apache.conf | 39 ++----------------- build/lemonldap-ng/_example/etc/apache2.conf | 39 ++----------------- build/lemonldap-ng/_example/etc/apps-list.xml | 2 +- 4 files changed, 10 insertions(+), 78 deletions(-) diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile index f5d88028d..2afaf1f03 100644 --- a/build/lemonldap-ng/Makefile +++ b/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;\ diff --git a/build/lemonldap-ng/_example/etc/apache.conf b/build/lemonldap-ng/_example/etc/apache.conf index d3d933cc2..7b198125a 100644 --- a/build/lemonldap-ng/_example/etc/apache.conf +++ b/build/lemonldap-ng/_example/etc/apache.conf @@ -43,8 +43,8 @@ LogLevel warn # On-line documentation - Alias /docs/ __DOCDIR__/docs/ - + Alias /doc/ __DOCDIR__ + Order deny,allow Allow from all @@ -54,40 +54,7 @@ LogLevel warn # Application Test ServerName test1.__DNSDOMAIN__ - - # SSO protection - PerlHeaderParserHandler My::Package - - # DocumentRoot - DocumentRoot __TESTDIR__ - - Order deny,allow - Allow from all - Options +ExecCGI - - - # Configuration reload mechanism (only 1 per physical server is - # needed): choose your URL to avoid restarting Apache when - # configuration change - - Order deny,allow - Deny from all - Allow from 127.0.0.0/8 - PerlHeaderParserHandler My::Package->refresh - - - # Uncomment this to activate status module - # - # Order deny,allow - # Deny from all - # Allow from 127.0.0.0/8 - # PerlHeaderParserHandler My::Package->status - # - - - - - ServerName test2.__DNSDOMAIN__ + ServerAlias test2.__DNSDOMAIN__ # SSO protection PerlHeaderParserHandler My::Package diff --git a/build/lemonldap-ng/_example/etc/apache2.conf b/build/lemonldap-ng/_example/etc/apache2.conf index d11ab55fa..0b7ebd070 100644 --- a/build/lemonldap-ng/_example/etc/apache2.conf +++ b/build/lemonldap-ng/_example/etc/apache2.conf @@ -45,8 +45,8 @@ LogLevel warn # On-line documentation - Alias /docs/ __DOCDIR__/docs/ - + Alias /doc/ __DOCDIR__ + Order deny,allow Allow from all @@ -56,40 +56,7 @@ LogLevel warn # Application Test ServerName test1.__DNSDOMAIN__ - - # SSO protection - PerlHeaderParserHandler My::Package - - # DocumentRoot - DocumentRoot __TESTDIR__ - - Order deny,allow - Allow from all - Options +ExecCGI - - - # Configuration reload mechanism (only 1 per physical server is - # needed): choose your URL to avoid restarting Apache when - # configuration change - - Order deny,allow - Deny from all - Allow from 127.0.0.0/8 - PerlHeaderParserHandler My::Package->refresh - - - # Uncomment this to activate status module - # - # Order deny,allow - # Deny from all - # Allow from 127.0.0.0/8 - # PerlHeaderParserHandler My::Package->status - # - - - - - ServerName test2.__DNSDOMAIN__ + ServerAlias test2.__DNSDOMAIN__ # SSO protection PerlHeaderParserHandler My::Package diff --git a/build/lemonldap-ng/_example/etc/apps-list.xml b/build/lemonldap-ng/_example/etc/apps-list.xml index 2ef52fbd5..feee9bc5c 100644 --- a/build/lemonldap-ng/_example/etc/apps-list.xml +++ b/build/lemonldap-ng/_example/etc/apps-list.xml @@ -39,7 +39,7 @@ Local documentation - http://manager.__DNSDOMAIN__/docs/ + http://manager.__DNSDOMAIN__/doc/ Documentation supplied with LemonLDAP::NG docs.png on