x/packstack
Code Issues Proposed changes

Merge "Add hostname to SSL redirection" into havana

Browse Source
This commit is contained in:
Jenkins
2014-05-05 15:56:34 +00:00
committed by Gerrit Code Review
parent c7de03eeb4 ebae5e8ef3
commit 33416e0e50
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/puppet/templates/https.pp
View File

@@ -31,9 +31,18 @@ file_line{'nohttp_ip':
$https_port = %(CONFIG_HORIZON_PORT)s $https_port = %(CONFIG_HORIZON_PORT)s
if ($::fqdn != "" and $::fqdn != "localhost") {
$vhostname = $::fqdn
}
else {
$vhostname = '%(CONFIG_HORIZON_HOST)s'
}
file{'/etc/httpd/conf.d/openstack-dashboard-vhost-port-80.conf': file{'/etc/httpd/conf.d/openstack-dashboard-vhost-port-80.conf':
ensure => present, ensure => present,
content => "\n<VirtualHost *:80>\n\tServerName %(CONFIG_HORIZON_HOST)s\n\tRedirect / https://%(CONFIG_HORIZON_HOST)s:${https_port}/\n</VirtualHost>\n", content => "\n<VirtualHost *:80>\n\tServerName ${vhostname}\n\tRewriteEngine On\n\tRewriteCond %%{HTTPS} !=on\n\tRewriteRule ^/?(.*) https://%%{SERVER_NAME}/$1 [R,L]\n</VirtualHost>\n",
} }
file_line{'redirect': file_line{'redirect':