ispman/install-data/templates vhosts.acl.template, NONE, 1.1 vhosts.conf.template, 1.21, 1.22

Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16115/install-data/templates

Modified Files:
	vhosts.conf.template 
Added Files:
	vhosts.acl.template 
Log Message:
fixed bug [ 1657912 ] vhost template should be prepared for apache 2.2


--- NEW FILE: vhosts.acl.template ---
<perl>
$_acl = qq|

	# Authentication with auth_ldap (apache 1.3)
	<IfModule mod_auth_ldap.c>
		<Location $location>
			AuthType Basic
			AuthName $vhost.$domain
			AuthLDAPURL ldap://$ldapHost/$ldapBaseDN?ispmanUserId?sub?$filter
			require valid-user
		</Location>
	</IfModule>

	# Authentication with authnz_ldap (apache 2.2)
	<IfModule mod_authnz_ldap.c>
		<Location $location>
			AuthType Basic
			AuthName $vhost.$domain
			AuthBasicProvider ldap
			AuthLDAPURL ldap://$ldapHost/$ldapBaseDN?ispmanUserId?sub?$filter
			require valid-user
		</Location>
	</IfModule>
|;
$_acl;
</perl>

Index: vhosts.conf.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhosts.conf.template,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- vhosts.conf.template	2 Aug 2006 15:50:25 -0000	1.21
+++ vhosts.conf.template	18 Feb 2007 13:57:45 -0000	1.22
@@ -41,14 +41,26 @@
 $_statsText=qq|
 
 	<Directory $statdir>
-                $ispmanVhostDocumentRootOption
-        <IfModule $apacheAuthLdapModule.c>
-   		AuthName "WebStats for $servername"
-                AuthType Basic
-                AuthLDAPURL ldap://$ldapHost/$ldapBaseDN?uid
-                require valid-user ou=users,ispmanDomain=$ispmanDomain,$ldapBaseDN
-                require valid-user ou=admins,$ldapBaseDN
-        </IfModule>
+		$ispmanVhostDocumentRootOption
+
+		# Authentication with auth_ldap (apache 1.3)
+		<IfModule mod_auth_ldap.c>
+			AuthName "WebStats for $servername"
+			AuthType Basic
+			AuthLDAPURL ldap://$ldapHost/$ldapBaseDN?uid
+			require valid-user ou=users,ispmanDomain=$ispmanDomain,$ldapBaseDN
+			require valid-user ou=admins,$ldapBaseDN
+		</IfModule>
+        
+		# Authentication with authnz_ldap (apache 2.2)
+		<IfModule mod_authnz_ldap.c>
+			AuthType Basic
+			AuthName "WebStats for $servername"
+			AuthBasicProvider ldap
+			AuthLDAPURL ldap://$ldapHost/$ldapBaseDN?uid
+			require ldap-user ou=users,ispmanDomain=$ispmanDomain,$ldapBaseDN
+			require valid-user ou=admins,$ldapBaseDN
+		</IfModule>
 	</Directory>
 |;
 }
@@ -57,9 +69,9 @@
 	
 </perl>
 
-        <perl>
-        $acltext;
-        </perl>
+	<perl>
+	$acltext;
+	</perl>
 
 	<IfModule mod_rewrite.c>
 		#If we have mod_rewrite then we can map users via rewrite and save on LDAP lookups


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV