From ce385975741765f6295f4d00c0ff9a653d8e4dcf Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 30 Jun 2014 18:50:59 +0200 Subject: [PATCH] Update apache templates for LL::NG 1.4.0 --- .../e-smith/templates/etc/httpd/conf/httpd.conf/97LemonLDAPHandler | 6 +++--- .../etc/httpd/conf/httpd.conf/WebAppVirtualHost/05LemonLDAPHandler | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97LemonLDAPHandler b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97LemonLDAPHandler index 3c3ad95..d215fe4 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97LemonLDAPHandler +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97LemonLDAPHandler @@ -4,7 +4,7 @@ # Load LemonLDAP::NG Handler PerlOptions +GlobalRequest -PerlRequire /var/lib/lemonldap-ng/handler/MyHandler.pm +PerlRequire Lemonldap/NG/Handler.pm # Common error page and security parameters #ErrorDocument 403 http://auth.{$DomainName}/?lmError=403 @@ -19,7 +19,7 @@ PerlRequire /var/lib/lemonldap-ng/handler/MyHandler.pm Order deny,allow Deny from all Allow from {"$localAccess $externalSSLAccess";} - PerlHeaderParserHandler My::Package->refresh + PerlHeaderParserHandler Lemonldap::NG::Handler->refresh # Uncomment this to activate status module @@ -27,6 +27,6 @@ PerlRequire /var/lib/lemonldap-ng/handler/MyHandler.pm # Order deny,allow # Deny from all # Allow from 127.0.0.0/8 -# PerlHeaderParserHandler My::Package->status +# PerlHeaderParserHandler Lemonldap::NG::Handler->status # diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/05LemonLDAPHandler b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/05LemonLDAPHandler index 5e0e1e4..4b6602e 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/05LemonLDAPHandler +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/05LemonLDAPHandler @@ -4,7 +4,7 @@ my $auth = $domain->prop('Authentication') || 'none'; if ($auth eq 'LemonLDAP'){ $OUT .= " # This virtualhost is configured to be protected by LemonLDAP NG\n" . - " PerlHeaderParserHandler My::Package\n" . + " PerlHeaderParserHandler Lemonldap::NG::Handler\n" . " ErrorDocument 403 https://auth.$DomainName/?lmError=403\n" . " ErrorDocument 500 https://auth.$DomainName/?lmError=500\n"; if (($domain->prop('LemonLDAPMenu') || 'disabled') eq 'enabled'){ @@ -13,7 +13,7 @@ if ($auth eq 'LemonLDAP'){ } elsif ($auth eq 'LemonLDAPBasic'){ $OUT .= " # This virtualhost is configured to be protected by LemonLDAP NG (basic auth)\n" . - " PerlHeaderParserHandler Lemonldap::NG::Handler::AuthBasic\n"; + " PerlHeaderParserHandler Lemonldap::NG::Handler::Specific::AuthBasic\n"; } }