[COOK-4469] - Use reload instead of restart on RHEL

Signed-off-by: Sean OMeara <[email protected]>
phutchins · Mar 28, 2014 · a783952 · a783952
1 parent 45f08b4
commit a783952
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/definitions/apache_conf.rb b/definitions/apache_conf.rb
@@ -21,6 +21,6 @@
   template "#{node['apache']['dir']}/mods-available/#{params[:name]}.conf" do
     source   "mods/#{params[:name]}.conf.erb"
     mode     '0644'
-    notifies :restart, 'service[apache2]'
+    notifies :reload, 'service[apache2]'
   end
 end
diff --git a/definitions/apache_module.rb b/definitions/apache_module.rb
@@ -36,7 +36,7 @@
   if params[:enable]
     execute "a2enmod #{params[:name]}" do
       command "/usr/sbin/a2enmod #{params[:name]}"
-      notifies :restart, 'service[apache2]'
+      notifies :reload, 'service[apache2]'
       not_if do
         ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.load") &&
         (::File.exists?("#{node['apache']['dir']}/mods-available/#{params[:name]}.conf") ? ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.conf") : true)
@@ -45,7 +45,7 @@
   else
     execute "a2dismod #{params[:name]}" do
       command "/usr/sbin/a2dismod #{params[:name]}"
-      notifies :restart, 'service[apache2]'
+      notifies :reload, 'service[apache2]'
       only_if { ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.load") }
     end
   end

diff --git a/definitions/apache_site.rb b/definitions/apache_site.rb
@@ -23,7 +23,7 @@
   if params[:enable]
     execute "a2ensite #{params[:name]}" do
       command "/usr/sbin/a2ensite #{params[:name]}"
-      notifies :restart, 'service[apache2]'
+      notifies :reload, 'service[apache2]'
       not_if do
         ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
         ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")
@@ -33,7 +33,7 @@
   else
     execute "a2dissite #{params[:name]}" do
       command "/usr/sbin/a2dissite #{params[:name]}"
-      notifies :restart, 'service[apache2]'
+      notifies :reload, 'service[apache2]'
       only_if do
         ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
         ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -159,7 +159,7 @@
   owner    'root'
   group    node['apache']['root_group']
   mode     '0644'
-  notifies :restart, 'service[apache2]'
+  notifies :reload, 'service[apache2]'
 end
 
 template 'apache2-conf-security' do
@@ -169,7 +169,7 @@
   group    node['apache']['root_group']
   mode     '0644'
   backup   false
-  notifies :restart, 'service[apache2]'
+  notifies :reload, 'service[apache2]'
 end
 
 template 'apache2-conf-charset' do
@@ -179,23 +179,23 @@
   group    node['apache']['root_group']
   mode     '0644'
   backup   false
-  notifies :restart, 'service[apache2]'
+  notifies :reload, 'service[apache2]'
 end
 
 template "#{node['apache']['dir']}/ports.conf" do
   source   'ports.conf.erb'
   owner    'root'
   group    node['apache']['root_group']
   mode     '0644'
-  notifies :restart, 'service[apache2]'
+  notifies :reload, 'service[apache2]'
 end
 
 template "#{node['apache']['dir']}/sites-available/default" do
   source   'default-site.erb'
   owner    'root'
   group    node['apache']['root_group']
   mode     '0644'
-  notifies :restart, 'service[apache2]'
+  notifies :reload, 'service[apache2]'
 end
 
 node['apache']['default_modules'].each do |mod|