From: Walter  Huf <walter.huf@corvisa.com>
Date: Mon, 22 Sep 2014 19:46:12 +0000 (-0500)
Subject: Stops automatically restarting apache2 every run
X-Git-Tag: v0.8.0~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fb17d2cdda9bd6810d7d2f4bfa739d129fac972;p=ceph-cookbooks.git

Stops automatically restarting apache2 every run

I don't know why this is in here, but it's disruptive. Perhaps there was a first-run issue
that needed the restart, so I set up the first-time notifications to restart Apache
---

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index 9f23e51..7f8b86b 100644
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -53,10 +53,12 @@ include_recipe 'apache2'
 
 apache_module 'fastcgi' do
   conf true
+  notifies :restart, 'service[apache2]'
 end
 
 apache_module 'rewrite' do
   conf false
+  notifies :restart, 'service[apache2]'
 end
 
 web_app 'rgw' do
@@ -66,10 +68,6 @@ web_app 'rgw' do
   ceph_rgw_addr node['ceph']['radosgw']['rgw_addr']
 end
 
-service 'apache2' do
-  action :restart
-end
-
 template '/var/www/s3gw.fcgi' do
   source 's3gw.fcgi.erb'
   owner 'root'