Merge "Enable SNI on Ubuntu 12.04 LTS"

This commit is contained in:
Jenkins 2015-10-21 19:43:32 +00:00 committed by Gerrit Code Review
commit f98e71bf65
2 changed files with 14 additions and 0 deletions

4
files/sni Normal file
View File

@ -0,0 +1,4 @@
# Enable SNI for HTTPS (this breaks HTTPS sites for MSIE on WinXP)
<IfModule mod_ssl.c>
NameVirtualHost *:443
</IfModule>

View File

@ -31,4 +31,14 @@ class httpd::ssl {
fail( "${::operatingsystem} not defined in httpd::ssl.")
}
}
if $::lsbdistcodename == 'precise' {
# Unconditionally enable SNI on Ubuntu 12.04 (it's on by default in 14.04)
file { '/etc/apache2/conf.d/sni':
ensure => present,
source => 'puppet:///modules/httpd/sni',
notify => Service['httpd'],
require => Package['httpd'],
}
}
}