MODULES-1696: ensure mod::setenvif is included if needed

strider · Jan 22, 2015 · 361ce83 · 361ce83
1 parent dd06847
commit 361ce83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -390,6 +390,12 @@
     }
   }
 
+  if ($setenv and ! empty($setenv)) or ($setenvif and ! empty($setenvif)) {
+    if ! defined(Class['apache::mod::setenvif']) {
+      include ::apache::mod::setenvif
+    }
+  }
+
   ## Create a default directory list if none defined
   if $directories {
     if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -281,6 +281,7 @@
       it { is_expected.to contain_class('apache::mod::passenger') }
       it { is_expected.to contain_class('apache::mod::fastcgi') }
       it { is_expected.to contain_class('apache::mod::headers') }
+      it { is_expected.to contain_class('apache::mod::setenvif') }
       it { is_expected.to contain_concat('30-rspec.example.com.conf').with({
         'owner'   => 'root',
         'mode'    => '0644',