Ensure mod::cgi is added when needed

Author: gcoxmoz

manifests/vhost.pp

@@ -2336,6 +2336,24 @@
         include apache::mod::authz_groupfile
       }
 
+      if 'options' in $directory {
+        if !('-ExecCGI' in $directory['options']) {
+          if 'ExecCGI' in $directory['options'] {
+            case $apache::mpm_module {
+              'prefork': {
+                include apache::mod::cgi
+              }
+              'worker': {
+                include apache::mod::cgid
+              }
+              default: {
+                # do nothing
+              }
+            }
+          }
+        }
+      }
+
       if 'dav' in $directory {
         include apache::mod::dav
         if $directory['dav'] == 'On' {

spec/defines/vhost_spec.rb

@@ -2275,6 +2275,70 @@
           it { is_expected.to compile }
           it { is_expected.to contain_class('apache::mod::autoindex') }
         end
+
+        context 'mod_cgi is included when requested by array' do
+          let :params do
+            {
+              'docroot' => '/var/www/foo',
+              'directories' => [
+                {
+                  'options' => ['ExecCGI'],
+                },
+              ]
+
+            }
+          end
+
+          it { is_expected.to compile }
+          if os_facts[:os]['family'] == 'Debian'
+            it { is_expected.not_to contain_class('apache::mod::cgi') }
+            it { is_expected.to contain_class('apache::mod::cgid') }
+          else
+            it { is_expected.to contain_class('apache::mod::cgi') }
+            it { is_expected.not_to contain_class('apache::mod::cgid') }
+          end
+        end
+
+        context 'mod_cgi is included when requested by string' do
+          let :params do
+            {
+              'docroot' => '/var/www/foo',
+              'directories' => [
+                {
+                  'options' => 'Indexes ExecCGI',
+                },
+              ]
+
+            }
+          end
+
+          it { is_expected.to compile }
+          if os_facts[:os]['family'] == 'Debian'
+            it { is_expected.not_to contain_class('apache::mod::cgi') }
+            it { is_expected.to contain_class('apache::mod::cgid') }
+          else
+            it { is_expected.to contain_class('apache::mod::cgi') }
+            it { is_expected.not_to contain_class('apache::mod::cgid') }
+          end
+        end
+
+        context 'mod_cgi is not included when unrequested' do
+          let :params do
+            {
+              'docroot' => '/var/www/foo',
+              'directories' => [
+                {
+                  'options' => '+Indexes -ExecCGI',
+                },
+              ]
+
+            }
+          end
+
+          it { is_expected.to compile }
+          it { is_expected.not_to contain_class('apache::mod::cgi') }
+          it { is_expected.not_to contain_class('apache::mod::cgid') }
+        end
       end
     end
   end