Merge pull request #1054 from butlern/ticket/1829-ensure_resources_no…

…tify_apache_service_class

Ensure resources notify Apache::Service class

README.md

@@ -2509,7 +2509,7 @@ Something along the lines of:
         exec { 'restorecon_apache':
           command => 'restorecon -Rv /apache_spec',
           path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
+          before  => Class['Apache::Service'],
           require => Class['apache'],
         }
         class { 'apache': }

manifests/balancer.pp

@@ -50,7 +50,7 @@
     owner  => '0',
     group  => '0',
     mode   => '0644',
-    notify => Service['httpd'],
+    notify => Class['Apache::Service'],
   }
 
   concat::fragment { "00-${name}-header":

manifests/custom_config.pp

@@ -34,7 +34,7 @@
   $filename = "${priority_prefix}${filename_middle}.conf"
 
   if ! $verify_config or $ensure == 'absent' {
-    $notifies = Service['httpd']
+    $notifies = Class['Apache::Service']
   } else {
     $notifies = undef
   }
@@ -53,7 +53,7 @@
       command     => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
-      notify      => Service['httpd'],
+      notify      => Class['Apache::Service'],
       before      => Exec["remove ${name} if invalid"],
     }
 

manifests/mod/auth_cas.pp

@@ -42,7 +42,7 @@
     content => template('apache/mod/auth_cas.conf.erb'),
     require => [ Exec["mkdir ${::apache::mod_dir}"], ],
     before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
+    notify  => Class['Apache::Service'],
   }
 
 }

spec/defines/custom_config_spec.rb

@@ -30,7 +30,7 @@
       'refreshonly' => 'true',
       'subscribe'   => 'File[apache_rspec]',
       'command'     => '/usr/sbin/apachectl -t',
-      'notify'      => 'Service[httpd]',
+      'notify'      => 'Class[Apache::Service]',
       'before'      => 'Exec[remove rspec if invalid]',
     })
     }
@@ -83,7 +83,7 @@
     it { is_expected.to_not contain_exec('service notify for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
-      'notify' => 'Service[httpd]'
+      'notify' => 'Class[Apache::Service]'
     })
     }
   end