opendev
/
puppet-httpd
Code Issues Proposed changes

Merge "Fixes vhost and vhost::proxy on Precise."

This commit is contained in:
Jenkins 2015-11-03 17:16:51 +00:00 committed by Gerrit Code Review
parent f98e71bf65 d8e4764ac8
commit 3d6423ebdf
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/vhost.pp
View File

@ -66,6 +66,12 @@ define httpd::vhost(
}
}
# The Apache mod_version module only needs to be enabled on Ubuntu 12.04
# as it comes compiled and enabled by default on newer OS, including CentOS
if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
httpd::mod { 'version': ensure => present }
}
file { "${priority}-${name}.conf":
path => "${httpd::params::vdir}/${priority}-${name}.conf",
content => template($template),

6
manifests/vhost/proxy.pp
View File

@ -45,6 +45,12 @@ define httpd::vhost::proxy (
include ::httpd::ssl
}
# The Apache mod_version module only needs to be enabled on Ubuntu 12.04
# as it comes compiled and enabled by default on newer OS, including CentOS
if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
httpd::mod { 'version': ensure => present }
}
file { "${priority}-${name}":
ensure => absent,
path => "${httpd::params::vdir}/${priority}-${name}",