From d8e4764ac8c84a318726937466f85287b859e373 Mon Sep 17 00:00:00 2001 From: Bruno Tavares Date: Tue, 20 Oct 2015 18:07:41 -0200 Subject: [PATCH] Fixes vhost and vhost::proxy on Precise. We recently introduced on bf7ce40e2fe7e28dab11ee2fb0ae26a50b5fa8bd 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 --- manifests/vhost.pp | 6 ++++++ manifests/vhost/proxy.pp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 16cdd95..5c9ded6 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -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), diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp index 8f0333b..54e814c 100644 --- a/manifests/vhost/proxy.pp +++ b/manifests/vhost/proxy.pp @@ -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}",