Browse Source

Merge "Fix vhost configuration sections"

Jenkins 4 years ago
parent
commit
3be00405e4
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      templates/vhost.erb

+ 3
- 2
templates/vhost.erb View File

@@ -1,4 +1,5 @@
1
-<VirtualHost <%= scope.lookupvar("openstackid::vhost_name") %>:80>
1
+<VirtualHost *:80>
2
+  ServerName <%= scope.lookupvar("openstackid::vhost_name") %>
2 3
   ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>
3 4
 
4 5
   ErrorLog ${APACHE_LOG_DIR}/openstackid-error.log
@@ -10,7 +11,7 @@
10 11
 </VirtualHost>
11 12
 
12 13
 <IfModule mod_ssl.c>
13
-<VirtualHost <%= scope.lookupvar("openstackid::vhost_name") %>:443>
14
+<VirtualHost *:443>
14 15
   ServerName <%= scope.lookupvar("openstackid::vhost_name") %>
15 16
   ServerAdmin <%= scope.lookupvar("openstackid::serveradmin") %>
16 17
 

Loading…
Cancel
Save