Changeset 478 for server/fedora/config/etc/httpd

Timestamp:

Oct 15, 2007, 5:27:38 AM (17 years ago)

Author:

geofft

Message:

more ldap chocolatey goodness

Location:

server/fedora/config/etc/httpd

Files:

• conf.d/vhost_ldap.conf (modified) (1 diff)
• conf/httpd.conf (modified) (5 diffs)

server/fedora/config/etc/httpd/conf.d/vhost_ldap.conf

@@ -8 +8 @@
 ### you have to enable mod_ldap as well ###
 
-# this should really go in httpd.conf
-LoadModule ldap_module modules/mod_ldap.so
-LoadModule vhost_ldap_module    modules/mod_vhost_ldap.so
-
-#<IfModule mod_vhost_ldap.c>
-    VhostLDAPEnabled on
-    VhostLDAPUrl "ldap://18.187.6.190/ou=vhosts,dc=scripts,dc=mit,dc=edu"
-    #VhostLdapBindDN "cn=admin,dc=localhost"
-    #VhostLDAPBindPassword "changeme"
-#</IfModule>
+VhostLDAPEnabled on
+VhostLDAPUrl "ldap://127.0.0.1/ou=vhosts,dc=scripts,dc=mit,dc=edu"
+VhostLDAPFallback notfound.example.com

server/fedora/config/etc/httpd/conf/httpd.conf

@@ -24 +24 @@
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
 LoadModule authz_default_module modules/mod_authz_default.so
-#LoadModule ldap_module modules/mod_ldap.so
+LoadModule ldap_module modules/mod_ldap.so
 #LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
 LoadModule include_module modules/mod_include.so
@@ -63 +63 @@
 LoadModule cgi_module modules/mod_cgi.so
 LoadModule ssl_module modules/mod_ssl.so
+LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
 
 User apache
@@ -249 +250 @@
 
 # LDAP vhost, w00t w00t
-# <VirtualHost *:80>
-#     Include conf.d/vhost_ldap.conf
-#     Include conf.d/vhosts-common.conf
-# </VirtualHost>
+<VirtualHost *:80>
+    Include conf.d/vhost_ldap.conf
+    Include conf.d/vhosts-common.conf
+</VirtualHost>
 
 <VirtualHost *:80>
@@ -293 +294 @@
         Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>
+    # LDAP vhost, w00t w00t
+    <VirtualHost *:443>
+        Include conf.d/vhost_ldap.conf
+        Include conf.d/vhosts-common-ssl.conf
+    </VirtualHost>
     <VirtualHost *:443>
         Include conf.d/scripts-vhost-names.conf
@@ -302 +308 @@
         DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
         Include conf.d/vhosts-common-ssl.conf
+    </VirtualHost>
+    # LDAP vhost, w00t w00t
+    <VirtualHost *:444>
+        Include conf.d/vhost_ldap.conf
+        Include conf.d/vhosts-common-ssl.conf
+        Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>
     <VirtualHost *:444>