summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-03 17:16:51 +0000
committerGerrit Code Review <review@openstack.org>2015-11-03 17:16:51 +0000
commit3d6423ebdf6a2f143624cf54463ea2f97f711d88 (patch)
tree96b3ad30fd2b180d700f7632b2311527d6c44edf
parentf98e71bf659e7225ecbc501101f9a60526b7e01b (diff)
parentd8e4764ac8c84a318726937466f85287b859e373 (diff)
Merge "Fixes vhost and vhost::proxy on Precise."
-rw-r--r--manifests/vhost.pp6
-rw-r--r--manifests/vhost/proxy.pp6
2 files changed, 12 insertions, 0 deletions
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(
66 } 66 }
67 } 67 }
68 68
69 # The Apache mod_version module only needs to be enabled on Ubuntu 12.04
70 # as it comes compiled and enabled by default on newer OS, including CentOS
71 if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
72 httpd::mod { 'version': ensure => present }
73 }
74
69 file { "${priority}-${name}.conf": 75 file { "${priority}-${name}.conf":
70 path => "${httpd::params::vdir}/${priority}-${name}.conf", 76 path => "${httpd::params::vdir}/${priority}-${name}.conf",
71 content => template($template), 77 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 (
45 include ::httpd::ssl 45 include ::httpd::ssl
46 } 46 }
47 47
48 # The Apache mod_version module only needs to be enabled on Ubuntu 12.04
49 # as it comes compiled and enabled by default on newer OS, including CentOS
50 if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
51 httpd::mod { 'version': ensure => present }
52 }
53
48 file { "${priority}-${name}": 54 file { "${priority}-${name}":
49 ensure => absent, 55 ensure => absent,
50 path => "${httpd::params::vdir}/${priority}-${name}", 56 path => "${httpd::params::vdir}/${priority}-${name}",