Merge "Prevent possible http_mod headers declaration conflict"

2015-11-23 12:36:07 +00:00 · 2015-11-23 12:36:07 +00:00 · d20e40f906
parent 933b580fd6 60cd705940
commit d20e40f906
1 changed files with 4 additions and 2 deletions
--- a/manifests/init.pp
+++ b/manifests/init.pp
@ -209,8 +209,10 @@ class graphite(
    template => 'graphite/graphite.vhost.erb',
  }

-  httpd_mod { 'headers':
-    ensure => present
+  if !defined(Httpd::Mod['headers']) {
+    ::httpd::mod { 'headers':
+      ensure => present,
+    }
  }

  vcsrepo { '/opt/statsd':