Changeset 2758 for trunk/server/fedora/config

Timestamp:

Feb 26, 2016, 6:08:03 AM (9 years ago)

Author:

andersk

Message:

reify-vhost.py: Use scriptsVhost records rather than apacheConfig records

File:

• trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py (modified) (3 diffs)

trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py

@@ -1 +1 @@
 #!/usr/bin/python
 #
-# Converts an apacheConfig record from LDAP, as used by mod_vhost_ldap,
+# Converts an scriptsVhost record from LDAP, as used by mod_vhost_ldap,
 # into a <VirtualHost> record as used in an Apache conf.d directory.
 # Useful for adding things like SSL server certs that mod_vhost_ldap
@@ -27 +27 @@
     ldap.SCOPE_SUBTREE,
     ldap.filter.filter_format(
-            "(&(objectClass=apacheConfig)" +
-            "(|(apacheServerName=%s)" +
-            "(apacheServerAlias=%s)))",
+            "(&(objectClass=scriptsVhost)" +
+            "(|(scriptsVhostName=%s)" +
+            "(scriptsVhostAlias=%s)))",
            [host, host]))
 if len(r) != 0:
     serveralias = ""
-    if 'apacheServerAlias' in r[0][1]:
-        serveralias = "ServerAlias "+" ".join(r[0][1]['apacheServerAlias'])
+    if 'scriptsVhostAlias' in r[0][1]:
+        serveralias = "ServerAlias "+" ".join(r[0][1]['scriptsVhostAlias'])
     print """\
 <IfModule ssl_module>
@@ -55 +55 @@
         </VirtualHost>
 </IfModule>""" % {
-    'servername': r[0][1]['apacheServerName'][0],
+    'servername': r[0][1]['scriptsVhostName'][0],
     'serveralias': serveralias,
     'hname': host