summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-21 19:43:32 +0000
committerGerrit Code Review <review@openstack.org>2015-10-21 19:43:32 +0000
commitf98e71bf659e7225ecbc501101f9a60526b7e01b (patch)
tree9418ee2e6abb3a0ae6bb5cb77198c7076fcc04c8
parentd2bd645ab6874017ccd5c4c09f020dc0656340f2 (diff)
parentebdc05976fa359c30fe6b5e6ab20a43414392d8e (diff)
Merge "Enable SNI on Ubuntu 12.04 LTS"
-rw-r--r--files/sni4
-rw-r--r--manifests/ssl.pp10
2 files changed, 14 insertions, 0 deletions
diff --git a/files/sni b/files/sni
new file mode 100644
index 0000000..67da4c3
--- /dev/null
+++ b/files/sni
@@ -0,0 +1,4 @@
1# Enable SNI for HTTPS (this breaks HTTPS sites for MSIE on WinXP)
2<IfModule mod_ssl.c>
3 NameVirtualHost *:443
4</IfModule>
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index 2e1569a..1a0d607 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -31,4 +31,14 @@ class httpd::ssl {
31 fail( "${::operatingsystem} not defined in httpd::ssl.") 31 fail( "${::operatingsystem} not defined in httpd::ssl.")
32 } 32 }
33 } 33 }
34
35 if $::lsbdistcodename == 'precise' {
36 # Unconditionally enable SNI on Ubuntu 12.04 (it's on by default in 14.04)
37 file { '/etc/apache2/conf.d/sni':
38 ensure => present,
39 source => 'puppet:///modules/httpd/sni',
40 notify => Service['httpd'],
41 require => Package['httpd'],
42 }
43 }
34} 44}