Changeset 1445 for trunk/server/fedora/config/etc/httpd

Timestamp:

Jan 26, 2010, 7:04:42 PM (15 years ago)

Author:

quentin

Message:

Handle vhosts that don't have any defined aliases

File:

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

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

@@ -33 +33 @@
 if len(r) != 0:
     user = pwd.getpwuid(int(r[0][1]['apacheSuexecUid'][0]))
+    serveralias = ""
+    if 'apacheServerAlias' in r[0][1]:
+        serveralias = "ServerAlias "+r[0][1]['apacheServerAlias'][0]
     print """# do not trailing-slash DocumentRoot
 
@@ -47 +50 @@
         <VirtualHost *:443>
                 ServerName %(servername)s
-                ServerAlias %(serveralias)s
+                %(serveralias)s
                 DocumentRoot %(docroot)s
                 Alias /~%(uname)s %(homedir)s/web_scripts
@@ -56 +59 @@
         <VirtualHost *:444>
                 ServerName %(servername)s
-                ServerAlias %(serveralias)s
+                %(serveralias)s
                 DocumentRoot %(docroot)s
                 Alias /~%(uname)s %(homedir)s/web_scripts
@@ -66 +69 @@
 </IfModule>""" % {
     'servername': r[0][1]['apacheServerName'][0],
-    'serveralias': r[0][1]['apacheServerAlias'][0],
+    'serveralias': serveralias,
     'docroot': r[0][1]['apacheDocumentRoot'][0],
     'uname': user[0],