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

Timestamp:

Nov 9, 2015, 4:26:30 PM (8 years ago)

Author:

andersk

Message:

Configure reified vhosts through LDAP

Reduces duplication, allows the owners to configure these vhosts
through Pony again, and potentially simplifies future automation.

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

@@ -32 +32 @@
            [host, host]))
 if len(r) != 0:
-    user = pwd.getpwuid(int(r[0][1]['apacheSuexecUid'][0]))
     serveralias = ""
     if 'apacheServerAlias' in r[0][1]:
         serveralias = "ServerAlias "+" ".join(r[0][1]['apacheServerAlias'])
-    print """# do not trailing-slash DocumentRoot
-
-<VirtualHost *:80>
-        ServerName %(servername)s
-        %(serveralias)s
-        DocumentRoot %(docroot)s
-        Alias /~%(uname)s %(homedir)s/web_scripts
-        SuExecUserGroup %(uname)s %(uname)s
-        Include conf.d/vhosts-common.conf
-</VirtualHost>
-
+    print """\
 <IfModule ssl_module>
         <VirtualHost *:443>
                 ServerName %(servername)s
                 %(serveralias)s
-                DocumentRoot %(docroot)s
-                Alias /~%(uname)s %(homedir)s/web_scripts
-                SuExecUserGroup %(uname)s %(uname)s
+                Include conf.d/vhost_ldap.conf
                 Include conf.d/vhosts-common-ssl.conf
                 SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem
@@ -61 +48 @@
                 ServerName %(servername)s
                 %(serveralias)s
-                DocumentRoot %(docroot)s
-                Alias /~%(uname)s %(homedir)s/web_scripts
-                SuExecUserGroup %(uname)s %(uname)s
+                Include conf.d/vhost_ldap.conf
                 Include conf.d/vhosts-common-ssl.conf
                 Include conf.d/vhosts-common-ssl-cert.conf
@@ -72 +57 @@
     'servername': r[0][1]['apacheServerName'][0],
     'serveralias': serveralias,
-    'docroot': r[0][1]['apacheDocumentRoot'][0],
-    'uname': user[0],
-    'homedir': user[5],
     'hname': host
 }