Merge pull request #2349 from bastelfreak/mpm_event

disable::mpm_event: Fix module deactivation

manifests/mpm/disable_mpm_event.pp

@@ -1,29 +1,11 @@
 # @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
-  $event_command = ['/usr/sbin/a2dismod', 'event']
-  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event.load'],'/')]]
-  exec { '/usr/sbin/a2dismod event':
+  $event_command = ['/usr/sbin/a2dismod', 'mpm_event']
+  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'mpm_event.load'],'/')]]
+  exec { '/usr/sbin/a2dismod mpm_event':
     command => $event_command,
     onlyif  => $event_onlyif,
     require => Package['httpd'],
-    before  => Class['apache::service'],
-  }
-
-  $event_load_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.load'],'/')]
-  $event_load_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.load'],'/')]]
-  exec { 'remove distribution event load file':
-    command => $event_load_command,
-    onlyif  => $event_load_onlyif,
-    require => Package['httpd'],
-    before  => Class['apache::service'],
-  }
-
-  $event_conf_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]
-  $event_conf_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]]
-  exec { 'remove distribution event conf file':
-    command => $event_conf_command,
-    onlyif  => $event_conf_onlyif,
-    require => Package['httpd'],
-    before  => Class['apache::service'],
+    notify  => Class['apache::service'],
   }
 }

spec/classes/apache_spec.rb

@@ -248,7 +248,7 @@
         { mpm_module: 'worker' }
       end
 
-      it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod mpm_event') }
       it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
     end