diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile index 908e7f4cc..2d93ed2b2 100644 --- a/build/lemonldap-ng/Makefile +++ b/build/lemonldap-ng/Makefile @@ -22,7 +22,6 @@ RBINDIR=$(DESTDIR)/$(BINDIR) DATADIR=$(LMPREFIX)/data RDATADIR=$(DESTDIR)/$(DATADIR) - EXAMPLEROOT=`pwd`/example # Document roots for Apache VirtualHosts @@ -69,9 +68,14 @@ APACHESESSIONFILEDIR=$(DATADIR)/sessions RAPACHESESSIONFILEDIR=$(DESTDIR)/$(APACHESESSIONFILEDIR) APACHESESSIONFILELOCKDIR=$(APACHESESSIONFILEDIR)/lock RAPACHESESSIONFILELOCKDIR=$(DESTDIR)/$(APACHESESSIONFILELOCKDIR) + +# Apache user/group APACHEUSER= APACHEGROUP= +# Apache version +APACHEVERSION=2 + # DNS Domain for cookie and virtual hosts DNSDOMAIN=example.com @@ -80,12 +84,15 @@ LDAPHOST=localhost LDAPPORT=389 LDAPSUFFIX=dc=example,dc=com +# Virtual Host Listen IP and Port (*, *:80, ...) +VHOSTLISTEN=*:80 + # Other VERSION=`head -n1 changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$$//'` PORTALSKINS=`ls lemonldap-ng-portal/example/skins/` MANAGERSKINS=`ls lemonldap-ng-manager/example/skins/` DIFF=diff -aburN -x '*.bak' -x .svn -x '*.swp' --ignore-matching-lines='.*jquery.*' --ignore-matching-lines='.*lemonldap-ng\.ini.*' - + SRCCOMMONDIR=lemonldap-ng-common SRCHANDLERDIR=lemonldap-ng-handler SRCPORTALDIR=lemonldap-ng-portal @@ -228,7 +235,9 @@ install_site: install_manager_site install_portal_site install_handler_site inst @install -v -d $(RCONFDIR) # Check if erase is wanted @if [ "$(ERASECONFIG)" -eq "1" ]; then \ - cp --remove-destination _example/etc/apache* $(RCONFDIR); \ + cp --remove-destination _example/etc/portal-apache$(APACHEVERSION).conf $(RCONFDIR); \ + cp --remove-destination _example/etc/handler-apache$(APACHEVERSION).conf $(RCONFDIR); \ + cp --remove-destination _example/etc/manager-apache$(APACHEVERSION).conf $(RCONFDIR); \ cp --remove-destination _example/etc/for_etc_hosts $(RCONFDIR); \ fi @$(PERL) -i -pe 's#__HANDLER__#${HANDLERDIR}/MyHandler.pm#; \ @@ -236,7 +245,8 @@ install_site: install_manager_site install_portal_site install_handler_site inst s#__PORTALDIR__#$(PORTALDIR)/#g; \ s#__MANAGERDIR__#$(MANAGERDIR)/#g; \ s#__TESTDIR__#$(TESTDIR)/#g; \ - s#__DOCDIR__#$(DOCDIR)/#g;' $(RCONFDIR)/apache* + s#__VHOSTLISTEN__#$(VHOSTLISTEN)#g; \ + s#__DOCDIR__#$(DOCDIR)/#g;' $(RCONFDIR)/*apache*.conf @$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)/for_etc_hosts @echo @echo "LemonLDAP::NG v${VERSION} is installed with these parameters:" @@ -249,17 +259,18 @@ install_site: install_manager_site install_portal_site install_handler_site inst @echo @echo "To finish configuration:" @echo - @echo "1 - Add this in your Apache configuration file:" - @echo " with Apache-1.3.x" - @echo " include ${CONFDIR}/apache.conf" - @echo " or with Apache-2.x:" - @echo " include ${CONFDIR}/apache2.conf" + @echo "1 - Add this in your Apache $(APACHEVERSION) configuration file:" + @echo " include ${CONFDIR}/portal-apache$(APACHEVERSION).conf" + @echo " include ${CONFDIR}/handler-apache$(APACHEVERSION).conf" + @echo " include ${CONFDIR}/manager-apache$(APACHEVERSION).conf" @echo - @echo "2 - Restart Apache (or Apache2)" + @echo "2 - Restart Apache:" + @echo " apache$(APACHEVERSION)ctl restart" @echo - @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 "4 - Use the manager at http://manager.${DNSDOMAIN}/ (after Apache restart) to modify LemonLDAP::NG configuration." + @echo "4 - Use the manager from localhost at http://manager.${DNSDOMAIN}/ (after Apache restart) to modify LemonLDAP::NG configuration." + @echo " Warning: If you access http://manager.${DNSDOMAIN}/ from other host, modify first Apache Manager configuration to allow access from non local address." @echo @echo "5 - Try to connect to http://test1.${DNSDOMAIN}/ or http://test2.${DNSDOMAIN}/" @if [ ! "$(APACHEUSER)" ]; then \ diff --git a/build/lemonldap-ng/_example/etc/apache.conf b/build/lemonldap-ng/_example/etc/apache.conf deleted file mode 100644 index 6bc1cb5cd..000000000 --- a/build/lemonldap-ng/_example/etc/apache.conf +++ /dev/null @@ -1,129 +0,0 @@ -NameVirtualHost * - -# Perl environment -PerlRequire __HANDLER__ - - SetHandler perl-script - PerlHandler Apache::Registry - - - DirectoryIndex index.pl index.html - - -# Common error page and security parameters -ErrorDocument 403 http://auth.__DNSDOMAIN__/error.pl?error=403 -ErrorDocument 500 http://auth.__DNSDOMAIN__/error.pl?error=500 -ServerSignature Off -LogLevel warn - -# Portal virtual host - - ServerName auth.__DNSDOMAIN__ - - # DocumentRoot - DocumentRoot __PORTALDIR__ - - Order allow,deny - Allow from all - Options +ExecCGI - - - # SOAP functions for sessions management (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for sessions access (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for configuration access (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for notification insertion (disabled by default) - - Order deny,allow - Deny from all - - - - -# Manager virtual host - - ServerName manager.__DNSDOMAIN__ - - # DocumentRoot - DocumentRoot __MANAGERDIR__ - - Order deny,allow - Deny from all - Allow from 127.0.0.0/8 - Options +ExecCGI - - - # On-line documentation - Alias /doc/ __DOCDIR__ - - Order deny,allow - Allow from all - - - - -# Application Test - - ServerName test1.__DNSDOMAIN__ - ServerAlias test2.__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 - # - - - -############################################## -## Best performance under ModPerl::Registry ## -############################################## - -# Uncomment this to increase performance of Portal: - - require Lemonldap::NG::Portal::SharedConf; - Lemonldap::NG::Portal::SharedConf->compile( - qw(delete header cache read_from_client cookie redirect unescapeHTML)); - # Uncomment this line if you use Lemonldap::NG menu - require Lemonldap::NG::Portal::Menu; - # Uncomment this line if you use portal SOAP capabilities - require SOAP::Lite; - - diff --git a/build/lemonldap-ng/_example/etc/apache2.conf b/build/lemonldap-ng/_example/etc/apache2.conf deleted file mode 100644 index f13ba7cdf..000000000 --- a/build/lemonldap-ng/_example/etc/apache2.conf +++ /dev/null @@ -1,138 +0,0 @@ -NameVirtualHost * - -# Perl environment -PerlRequire __HANDLER__ -PerlOptions +GlobalRequest - - SetHandler perl-script - PerlHandler ModPerl::Registry - PerlSendHeader On - - - DirectoryIndex index.pl index.html - - -# Common error page and security parameters -ErrorDocument 403 http://auth.__DNSDOMAIN__/error.pl?error=403 -ErrorDocument 500 http://auth.__DNSDOMAIN__/error.pl?error=500 -ServerSignature Off -LogLevel warn - -# Portal virtual host - - ServerName auth.__DNSDOMAIN__ - - # DocumentRoot - DocumentRoot __PORTALDIR__ - - Order allow,deny - Allow from all - Options +ExecCGI - Options FollowSymLinks - - - # SOAP functions for sessions management (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for sessions access (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for configuration access (disabled by default) - - Order deny,allow - Deny from all - - - # SOAP functions for notification insertion (disabled by default) - - Order deny,allow - Deny from all - - - # SAML URL rewriting - RewriteEngine On - RewriteRule ^/saml/metadata /metadata.pl - RewriteRule ^/saml/.* /index.pl - - - -# Manager virtual host - - ServerName manager.__DNSDOMAIN__ - - # DocumentRoot - DocumentRoot __MANAGERDIR__ - - Order deny,allow - Deny from all - Allow from 127.0.0.0/8 - Options +ExecCGI - Options FollowSymLinks - - - # On-line documentation - Alias /doc/ __DOCDIR__ - - Order deny,allow - Allow from all - - - - -# Application Test - - ServerName test1.__DNSDOMAIN__ - ServerAlias test2.__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 - # - - - -############################################## -## Best performance under ModPerl::Registry ## -############################################## - -## Uncomment this to increase performance of Portal: - - require Lemonldap::NG::Portal::SharedConf; - Lemonldap::NG::Portal::SharedConf->compile( - qw(delete header cache read_from_client cookie redirect unescapeHTML)); - # Uncomment this line if you use Lemonldap::NG menu - require Lemonldap::NG::Portal::Menu; - # Uncomment this line if you use portal SOAP capabilities - #require SOAP::Lite; - - diff --git a/build/lemonldap-ng/_example/etc/apps-list.dtd b/build/lemonldap-ng/_example/etc/apps-list.dtd deleted file mode 100644 index 5d3bb543c..000000000 --- a/build/lemonldap-ng/_example/etc/apps-list.dtd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/build/lemonldap-ng/_example/etc/apps-list.xml b/build/lemonldap-ng/_example/etc/apps-list.xml deleted file mode 100644 index feee9bc5c..000000000 --- a/build/lemonldap-ng/_example/etc/apps-list.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - Application Test 1 - http://test1.__DNSDOMAIN__/ - A simple application displaying authenticated user - wheels.png - auto - - - Application Test 2 - http://test2.__DNSDOMAIN__/ - The same simple application displaying authenticated user - wheels.png - auto - - - - - - WebSSO Manager - http://manager.__DNSDOMAIN__/ - Configure LemonLDAP::NG WebSSO - tools.png - on - - - Sessions explorer - http://manager.__DNSDOMAIN__/sessions.pl - Explore WebSSO sessions - tools.png - on - - - - - - Local documentation - http://manager.__DNSDOMAIN__/doc/ - Documentation supplied with LemonLDAP::NG - docs.png - on - - - Offical Website - http://wiki.lemonldap.objectweb.org/xwiki/bin/view/NG/Presentation - Official LemonLDAP::NG Website - web.png - on - - - diff --git a/build/lemonldap-ng/_example/etc/handler-apache.conf b/build/lemonldap-ng/_example/etc/handler-apache.conf new file mode 100644 index 000000000..54f991e2c --- /dev/null +++ b/build/lemonldap-ng/_example/etc/handler-apache.conf @@ -0,0 +1,61 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Handler +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Load LemonLDAP::NG Handler +PerlRequire __HANDLER__ + +# Common error page and security parameters +ErrorDocument 403 http://auth.__DNSDOMAIN__/error.pl?error=403 +ErrorDocument 500 http://auth.__DNSDOMAIN__/error.pl?error=500 + +# Sample application + + ServerName test1.__DNSDOMAIN__ + ServerAlias test2.__DNSDOMAIN__ + + # SSO protection + PerlHeaderParserHandler My::Package + + # DocumentRoot + DocumentRoot __TESTDIR__ + + Order deny,allow + Allow from all + Options +ExecCGI + + + # Perl script (application test is written in Perl) + + SetHandler perl-script + PerlHandler Apache::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + # 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 + # + + + diff --git a/build/lemonldap-ng/_example/etc/handler-apache2.conf b/build/lemonldap-ng/_example/etc/handler-apache2.conf new file mode 100644 index 000000000..80cb47187 --- /dev/null +++ b/build/lemonldap-ng/_example/etc/handler-apache2.conf @@ -0,0 +1,62 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Handler +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Load LemonLDAP::NG Handler +PerlOptions +GlobalRequest +PerlRequire __HANDLER__ + +# Common error page and security parameters +ErrorDocument 403 http://auth.__DNSDOMAIN__/error.pl?error=403 +ErrorDocument 500 http://auth.__DNSDOMAIN__/error.pl?error=500 + +# Sample application + + ServerName test1.__DNSDOMAIN__ + ServerAlias test2.__DNSDOMAIN__ + + # SSO protection + PerlHeaderParserHandler My::Package + + # DocumentRoot + DocumentRoot __TESTDIR__ + + Order deny,allow + Allow from all + Options +ExecCGI + + + # Perl script (application test is written in Perl) + + SetHandler perl-script + PerlResponseHandler ModPerl::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + # 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 + # + + + diff --git a/build/lemonldap-ng/_example/etc/manager-apache.conf b/build/lemonldap-ng/_example/etc/manager-apache.conf new file mode 100644 index 000000000..83019174f --- /dev/null +++ b/build/lemonldap-ng/_example/etc/manager-apache.conf @@ -0,0 +1,40 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Manager +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Manager virtual host (manager.__DNSDOMAIN__) + + ServerName manager.__DNSDOMAIN__ + + # DocumentRoot + DocumentRoot __MANAGERDIR__ + + Order deny,allow + Deny from all + Allow from 127.0.0.0/8 + Options +ExecCGI + + + # On-line documentation + Alias /doc/ __DOCDIR__ + + Order deny,allow + Allow from all + + + # Perl script + + SetHandler perl-script + PerlHandler Apache::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + + diff --git a/build/lemonldap-ng/_example/etc/manager-apache2.conf b/build/lemonldap-ng/_example/etc/manager-apache2.conf new file mode 100644 index 000000000..3774398a9 --- /dev/null +++ b/build/lemonldap-ng/_example/etc/manager-apache2.conf @@ -0,0 +1,40 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Manager +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Manager virtual host (manager.__DNSDOMAIN__) + + ServerName manager.__DNSDOMAIN__ + + # DocumentRoot + DocumentRoot __MANAGERDIR__ + + Order deny,allow + Deny from all + Allow from 127.0.0.0/8 + Options +ExecCGI + + + # On-line documentation + Alias /doc/ __DOCDIR__ + + Order deny,allow + Allow from all + + + # Perl script + + SetHandler perl-script + PerlResponseHandler ModPerl::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + + diff --git a/build/lemonldap-ng/_example/etc/portal-apache.conf b/build/lemonldap-ng/_example/etc/portal-apache.conf new file mode 100644 index 000000000..f1445d7d1 --- /dev/null +++ b/build/lemonldap-ng/_example/etc/portal-apache.conf @@ -0,0 +1,75 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Portal +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Portal Virtual Host (auth.__DNSDOMAIN__) + + ServerName auth.__DNSDOMAIN__ + + # DocumentRoot + DocumentRoot __PORTALDIR__ + + Order allow,deny + Allow from all + Options +ExecCGI + + + # Perl script + + SetHandler perl-script + PerlHandler Apache::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + # SOAP functions for sessions management (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for sessions access (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for configuration access (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for notification insertion (disabled by default) + + Order deny,allow + Deny from all + + + # SAML2 + + RewriteEngine On + RewriteRule ^/saml/metadata /metadata.pl + RewriteRule ^/saml/.* /index.pl + + + + +# Best performance under ModPerl::Registry +# Uncomment this to increase performance of Portal + + require Lemonldap::NG::Portal::SharedConf; + Lemonldap::NG::Portal::SharedConf->compile( + qw(delete header cache read_from_client cookie redirect unescapeHTML)); + # Uncomment this line if you use Lemonldap::NG menu + require Lemonldap::NG::Portal::Menu; + # Uncomment this line if you use portal SOAP capabilities + require SOAP::Lite; + + diff --git a/build/lemonldap-ng/_example/etc/portal-apache2.conf b/build/lemonldap-ng/_example/etc/portal-apache2.conf new file mode 100644 index 000000000..eee6dbe07 --- /dev/null +++ b/build/lemonldap-ng/_example/etc/portal-apache2.conf @@ -0,0 +1,75 @@ +#==================================================================== +# Apache configuration for LemonLDAP::NG Portal +#==================================================================== + +# Uncomment this if no previous NameVirtualHost declaration +#NameVirtualHost __VHOSTLISTEN__ + +# Portal Virtual Host (auth.__DNSDOMAIN__) + + ServerName auth.__DNSDOMAIN__ + + # DocumentRoot + DocumentRoot __PORTALDIR__ + + Order allow,deny + Allow from all + Options +ExecCGI + + + # Perl script + + SetHandler perl-script + PerlResponseHandler ModPerl::Registry + + + # Directory index + + DirectoryIndex index.pl index.html + + + # SOAP functions for sessions management (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for sessions access (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for configuration access (disabled by default) + + Order deny,allow + Deny from all + + + # SOAP functions for notification insertion (disabled by default) + + Order deny,allow + Deny from all + + + # SAML2 + + RewriteEngine On + RewriteRule ^/saml/metadata /metadata.pl + RewriteRule ^/saml/.* /index.pl + + + + +# Best performance under ModPerl::Registry +# Uncomment this to increase performance of Portal + + require Lemonldap::NG::Portal::SharedConf; + Lemonldap::NG::Portal::SharedConf->compile( + qw(delete header cache read_from_client cookie redirect unescapeHTML)); + # Uncomment this line if you use Lemonldap::NG menu + require Lemonldap::NG::Portal::Menu; + # Uncomment this line if you use portal SOAP capabilities + require SOAP::Lite; + + diff --git a/build/lemonldap-ng/changelog b/build/lemonldap-ng/changelog index 0460c2369..f76d3ffb4 100644 --- a/build/lemonldap-ng/changelog +++ b/build/lemonldap-ng/changelog @@ -1,8 +1,6 @@ -lemonldap-ng (0.9.5) unstable; urgency=low +lemonldap-ng (1.0-rc1) unstable; urgency=low - * TODO * Little Debian changes (see 0.9.4.1-2 Debian changelog) - * Update to jQuery 1.3.2 (Closes: #314394) * AuthCAS: URL redirection and module load test * Change multiple configuration files into lemonldap-ng.ini * New manager @@ -10,13 +8,16 @@ lemonldap-ng (0.9.5) unstable; urgency=low * DBI conf storage module is deprecated * convertConfig and lmMigrateConfFiles2ini tools * childInit() is called only 1 time - * Update JQuery to 1.3 and JQueri-UI 1.7.2 + * Update JQuery to 1.3 and JQueri-UI 1.7.2 (Closes: #314394) * New authentication and userDB modules : - DBI - Proxy - Env (UserDB only) + - SAML * Portal index.pl use lemonldap-ng.ini to get parameters * CSS and Javascript minification capability + * Apache configuration splitted into portal/manager/handler + * XML Menu deprecated -- Xavier Guimard Thu, 31 Dec 2009 14:09:13 +0100