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}",