Send mdadm notification to the admins list

[chef.git] / cookbooks / osqa / recipes / default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 2ed82d2699e277a5ce4e465e27971df51465db0d..98707f9ba1bd79c594c1061d0802782928a32aeb 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -61,7 +61,7 @@ node[:osqa][:sites].each do |site|
     cwd "#{directory}/osqa"
     user site_user
     group site_group
     cwd "#{directory}/osqa"
     user site_user
     group site_group

-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"

   end
 
   subversion "#{directory}/osqa" do
   end
 
   subversion "#{directory}/osqa" do


@@ -70,7 +70,7 @@ node[:osqa][:sites].each do |site|
     revision osqa_revision
     user site_user
     group site_group
     revision osqa_revision
     user site_user
     group site_group

-    notifies :run, resources(:execute => "osqa-migrate")
+    notifies :run, "execute[osqa-migrate]"

   end
 
   remote_directory "#{directory}/osqa/forum_modules/osmauth" do
   end
 
   remote_directory "#{directory}/osqa/forum_modules/osmauth" do


@@ -89,25 +89,27 @@ node[:osqa][:sites].each do |site|
     group site_group
     mode 0644
     variables :directory => directory
     group site_group
     mode 0644
     variables :directory => directory

-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"
+  end
+
+  settings = edit_file "#{directory}/osqa/settings_local.py.dist" do |line|
+    line.gsub!(/^( *)'ENGINE': '.*',/, "\\1'ENGINE': 'django.db.backends.postgresql_psycopg2',")
+    line.gsub!(/^( *)'NAME': '.*',/, "\\1'NAME': '#{database_name}',")
+    line.gsub!(/^( *)'USER': '.*',/, "\\1'USER': '#{database_user}',")
+    line.gsub!(/^( *)'PASSWORD': '.*',/, "\\1'PASSWORD': '#{database_password}',")
+    line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'")
+    line.gsub!(/^APP_URL = 'http:\/\/'/, "APP_URL = 'http://#{name}'")
+    line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'")
+    line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
+
+    line

   end
 
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
     mode 0644
   end
 
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
     mode 0644

-    content_from_file "#{directory}/osqa/settings_local.py.dist" do |line|
-      line.gsub!(/^( *)'ENGINE': '.*',/, "\\1'ENGINE': 'django.db.backends.postgresql_psycopg2',")
-      line.gsub!(/^( *)'NAME': '.*',/, "\\1'NAME': '#{database_name}',")
-      line.gsub!(/^( *)'USER': '.*',/, "\\1'USER': '#{database_user}',")
-      line.gsub!(/^( *)'PASSWORD': '.*',/, "\\1'PASSWORD': '#{database_password}',")
-      line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'")
-      line.gsub!(/^APP_URL = 'http:\/\/'/, "APP_URL = 'http://#{name}'")
-      line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'")
-      line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
-
-      line
-    end
-    notifies :reload, resources(:service => "apache2")
+    content settings
+    notifies :reload, "service[apache2]"

   end
 end
   end
 end