Commit 81485793 authored by Clément OUDOT's avatar Clément OUDOT

LEMONLDAP::NG : clean apache conf

parent 5483c445
...@@ -45,9 +45,6 @@ REXAMPLESDIR=$(DESTDIR)$(EXAMPLESDIR) ...@@ -45,9 +45,6 @@ REXAMPLESDIR=$(DESTDIR)$(EXAMPLESDIR)
TOOLSDIR=$(LMPREFIX)tools/ TOOLSDIR=$(LMPREFIX)tools/
RTOOLSDIR=$(DESTDIR)$(TOOLSDIR) RTOOLSDIR=$(DESTDIR)$(TOOLSDIR)
DOCDIR=$(DOCUMENTROOT)doc/
RDOCDIR=$(DESTDIR)$(DOCDIR)
# Handler dir # Handler dir
HANDLERDIR=$(LMPREFIX)handler/ HANDLERDIR=$(LMPREFIX)handler/
RHANDLERDIR=$(DESTDIR)$(HANDLERDIR) RHANDLERDIR=$(DESTDIR)$(HANDLERDIR)
...@@ -193,7 +190,7 @@ install_site: install_manager_site install_portal_site install_handler_site inst ...@@ -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 @perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)for_etc_hosts
# #
@echo @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 " - System configuration: ${CONFDIR}"
@echo " - DNS domain (for cookies and virtual hosts): ${DNSDOMAIN}" @echo " - DNS domain (for cookies and virtual hosts): ${DNSDOMAIN}"
@echo " - LDAP parameters:" @echo " - LDAP parameters:"
...@@ -214,7 +211,7 @@ install_site: install_manager_site install_portal_site install_handler_site inst ...@@ -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 "3 - Run 'make postconf' as root to update /etc/hosts" if your DNS service does not known auth.$(DNSDOMAIN) and manager.$(DNSDOMAIN)
@echo @echo
@echo "4 - Use the manager at http://manager.${DNSDOMAIN}/ (after Apache restart) to modify LemonLDAP::NG configuration." @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
@echo "5 - Try to connect to http://test1.${DNSDOMAIN}/ or http://test2.${DNSDOMAIN}/" @echo "5 - Try to connect to http://test1.${DNSDOMAIN}/ or http://test2.${DNSDOMAIN}/"
@if [ "$(APACHEUSER)" == "" ]; then \ @if [ "$(APACHEUSER)" == "" ]; then \
...@@ -317,6 +314,7 @@ install_conf_dir: install_sessions_dir ...@@ -317,6 +314,7 @@ install_conf_dir: install_sessions_dir
# Configuration files install # Configuration files install
@install -v -d $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR) @install -v -d $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR)
@cp --remove-destination $(SRCCOMMONDIR)storage.conf $(RCONFDIR) @cp --remove-destination $(SRCCOMMONDIR)storage.conf $(RCONFDIR)
@perl -i -pe 's#^dirName = .*#dirName = $(RFILECONFIGDIR)#g' $(RCONFDIR)storage.conf
@cp _example/conf/lmConf-1 $(RFILECONFIGDIR) @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 -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;\ @perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g;\
......
...@@ -43,8 +43,8 @@ LogLevel warn ...@@ -43,8 +43,8 @@ LogLevel warn
</Directory> </Directory>
# On-line documentation # On-line documentation
Alias /docs/ __DOCDIR__/docs/ Alias /doc/ __DOCDIR__
<Directory __DOCDIR__/docs/> <Directory __DOCDIR__>
Order deny,allow Order deny,allow
Allow from all Allow from all
</Directory> </Directory>
...@@ -54,40 +54,7 @@ LogLevel warn ...@@ -54,40 +54,7 @@ LogLevel warn
# Application Test # Application Test
<VirtualHost *> <VirtualHost *>
ServerName test1.__DNSDOMAIN__ ServerName test1.__DNSDOMAIN__
ServerAlias test2.__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__
# SSO protection # SSO protection
PerlHeaderParserHandler My::Package PerlHeaderParserHandler My::Package
......
...@@ -45,8 +45,8 @@ LogLevel warn ...@@ -45,8 +45,8 @@ LogLevel warn
</Directory> </Directory>
# On-line documentation # On-line documentation
Alias /docs/ __DOCDIR__/docs/ Alias /doc/ __DOCDIR__
<Directory __DOCDIR__/docs/> <Directory __DOCDIR__>
Order deny,allow Order deny,allow
Allow from all Allow from all
</Directory> </Directory>
...@@ -56,40 +56,7 @@ LogLevel warn ...@@ -56,40 +56,7 @@ LogLevel warn
# Application Test # Application Test
<VirtualHost *> <VirtualHost *>
ServerName test1.__DNSDOMAIN__ ServerName test1.__DNSDOMAIN__
ServerAlias test2.__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__
# SSO protection # SSO protection
PerlHeaderParserHandler My::Package PerlHeaderParserHandler My::Package
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<category name="Documentation"> <category name="Documentation">
<application id="localdoc"> <application id="localdoc">
<name>Local documentation</name> <name>Local documentation</name>
<uri>http://manager.__DNSDOMAIN__/docs/</uri> <uri>http://manager.__DNSDOMAIN__/doc/</uri>
<description>Documentation supplied with LemonLDAP::NG</description> <description>Documentation supplied with LemonLDAP::NG</description>
<logo>docs.png</logo> <logo>docs.png</logo>
<display>on</display> <display>on</display>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment