Fixes vhost and vhost::proxy on Precise.
We recently introduced on bf7ce40e2f
the
use of mod_version. The module is enabled and installed by default on
Ubuntu Trusty 14.04, CentOS 6 and CentOS 7.
On Ubuntu Precise 12.04 the module comes installed, but not enabled by
default. This is needed to maintain compatibility with downstream pool
of servers.
Change-Id: I01a8a12b959e3cbecd0355562db0393404ae54bf
Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com>
This commit is contained in:
parent
d2bd645ab6
commit
d8e4764ac8
|
@ -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":
|
file { "${priority}-${name}.conf":
|
||||||
path => "${httpd::params::vdir}/${priority}-${name}.conf",
|
path => "${httpd::params::vdir}/${priority}-${name}.conf",
|
||||||
content => template($template),
|
content => template($template),
|
||||||
|
|
|
@ -45,6 +45,12 @@ define httpd::vhost::proxy (
|
||||||
include ::httpd::ssl
|
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}":
|
file { "${priority}-${name}":
|
||||||
ensure => absent,
|
ensure => absent,
|
||||||
path => "${httpd::params::vdir}/${priority}-${name}",
|
path => "${httpd::params::vdir}/${priority}-${name}",
|
||||||
|
|
Loading…
Reference in New Issue