Convert all notify/subscribe calls to the new style syntax

diff --git a/cookbooks/apache/definitions/apache_module.rb b/cookbooks/apache/definitions/apache_module.rb
index 4ac89432d577b56b0b44b65932e6539953c8e264..beb43b2efb87f6cbf2f87ddae06a4c253ada0338 100644 (file)
--- a/cookbooks/apache/definitions/apache_module.rb
+++ b/cookbooks/apache/definitions/apache_module.rb
@@ -41,7 +41,7 @@ define :apache_module, :action => [ :install, :enable ], :variables => {} do
         mode 0644
         variables params[:variables]
         if File.exists?("/etc/apache2/mods-enabled/#{name}.load")
-          notifies :reload, resources(:service => "apache2")
+          notifies :reload, "service[apache2]"
         end
       end
     end
@@ -50,13 +50,13 @@ define :apache_module, :action => [ :install, :enable ], :variables => {} do
   if module_action.include?(:enable)
     execute "a2enmod-#{name}" do
       command "/usr/sbin/a2enmod #{name}"
-      notifies :restart, resources(:service => "apache2")
+      notifies :restart, "service[apache2]"
       not_if { File.exists?("/etc/apache2/mods-enabled/#{name}.load") }
     end
   elsif module_action.include?(:disable) or module_action.include?(:remove)
     execute "a2dismod-#{name}" do
       command "/usr/sbin/a2dismod #{name}"
-      notifies :restart, resources(:service => "apache2")
+      notifies :restart, "service[apache2]"
       only_if { File.exists?("/etc/apache2/mods-enabled/#{name}.load") }
     end
   end

diff --git a/cookbooks/apache/definitions/apache_site.rb b/cookbooks/apache/definitions/apache_site.rb
index c0895959d19a915fc6f639f6a6a38df5ec566c6d..53620a1139ff6e94e306955d8b881dd8487305f1 100644 (file)
--- a/cookbooks/apache/definitions/apache_site.rb
+++ b/cookbooks/apache/definitions/apache_site.rb
@@ -32,7 +32,7 @@ define :apache_site, :action => [ :create, :enable ], :variables => {} do
       mode 0644
       variables params[:variables].merge(:name => name, :directory => directory)
       if File.exists?("/etc/apache2/sites-enabled/#{link_name}")
-        notifies :reload, resources(:service => "apache2")
+        notifies :reload, "service[apache2]"
       end
     end
   end
@@ -40,14 +40,14 @@ define :apache_site, :action => [ :create, :enable ], :variables => {} do
   if site_action.include?(:enable)
     execute "a2ensite-#{name}" do
       command "/usr/sbin/a2ensite #{name}"
-      notifies :restart, resources(:service => "apache2")
+      notifies :restart, "service[apache2]"
       not_if { File.exists?("/etc/apache2/sites-enabled/#{link_name}") }
     end
   elsif site_action.include?(:disable) or site_action.include?(:delete)
     execute "a2dissite-#{name}" do
       action :run
       command "/usr/sbin/a2dissite #{name}"
-      notifies :restart, resources(:service => "apache2")
+      notifies :restart, "service[apache2]"
       only_if { File.exists?("/etc/apache2/sites-enabled/#{link_name}") }
     end
   end

diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
index b32c11c8b5eeaa7ef65c3c32747a591001879c72..356416795afa86f525e4800d4f8aa2429fb34388 100644 (file)
--- a/cookbooks/apache/recipes/ssl.rb
+++ b/cookbooks/apache/recipes/ssl.rb
@@ -32,12 +32,12 @@ template "/etc/apache2/conf.d/ssl" do
   group "root"
   mode 0644
   variables :certificate => certificate
-  notifies :reload, resources(:service => "apache2")
+  notifies :reload, "service[apache2]"
 end
 
 service "apache2" do
   action :nothing
-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/rapidssl.pem")
-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/#{certificate}.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/#{certificate}.key")
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
+  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
 end

diff --git a/cookbooks/apt/definitions/apt_source.rb b/cookbooks/apt/definitions/apt_source.rb
index f98b2b22c55a0188448ecc919ca1c4f1d2595e1d..382f9cce497dc2342d0f5285b0958accc9c183ad 100644 (file)
--- a/cookbooks/apt/definitions/apt_source.rb
+++ b/cookbooks/apt/definitions/apt_source.rb
@@ -37,7 +37,7 @@ define :apt_source do
     owner "root"
     group "root"
     mode 0644
-    notifies :run, resources(:execute => "apt-update")
+    notifies :run, "execute[apt-update]"
     variables :url => params[:url]
   end
 end

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 65f625a0bf2739b831be7f59292746d0a033e0da..a8e41cc0f9a7ca156ce90ebe645b0176c09ab6de 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,7 +34,7 @@ template "/etc/apt/sources.list" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "apt-update")
+  notifies :run, "execute[apt-update]"
 end
 
 apt_source "opscode" do

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 80dee1de3a16002d068ab917d184682da14c94e2..1d2a8d8bf336fe4fe29cfdc807edb8a3d31af4ff 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -31,7 +31,7 @@ template "/etc/bind/named.conf.local" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "bind9")
+  notifies :restart, "service[bind9]"
 end
 
 template "/etc/bind/named.conf.options" do
@@ -39,7 +39,7 @@ template "/etc/bind/named.conf.options" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "bind9")
+  notifies :restart, "service[bind9]"
 end
 
 template "/etc/bind/db.10" do
@@ -47,7 +47,7 @@ template "/etc/bind/db.10" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "bind9")
+  notifies :reload, "service[bind9]"
 end
 
 firewall_rule "accept-dns-udp" do

diff --git a/cookbooks/chef/definitions/ohai_plugin.rb b/cookbooks/chef/definitions/ohai_plugin.rb
index 06e9d300d6724b1faa4354bf262d8c5704b2037b..50be323fea34930f557d6e604b66f89ba80227a1 100644 (file)
--- a/cookbooks/chef/definitions/ohai_plugin.rb
+++ b/cookbooks/chef/definitions/ohai_plugin.rb
@@ -31,7 +31,7 @@ define :ohai_plugin, :action => [ :create, :delete ] do
       owner "root"
       group "root"
       mode 0644
-      notifies :reload, resources(:ohai => plugin_name)
+      notifies :reload, "ohai[#{plugin_name}]"
     end
   elsif plugin_action.include?(:delete)
     template "/etc/chef/ohai/#{plugin_name}.rb" do

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 28e2d77794ffaab78e6dcedafff842d5496c43a9..58cea555e2b2cbf9795aa8198741e7482997edbd 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -124,7 +124,7 @@ execute "civicrm-load-data" do
   cwd "/usr/share/drupal7/sites/all/modules/civicrm"
   user "root"
   group "root"
-  notifies :run, resources(:execute => "civicrm-load-acl")
+  notifies :run, "execute[civicrm-load-acl]"
 end
 
 execute "civicrm-load" do
@@ -133,7 +133,7 @@ execute "civicrm-load" do
   cwd "/usr/share/drupal7/sites/all/modules/civicrm"
   user "root"
   group "root"
-  notifies :run, resources(:execute => "civicrm-load-data")
+  notifies :run, "execute[civicrm-load-data]"
 end
 
 execute "civicrm-gencode" do
@@ -142,7 +142,7 @@ execute "civicrm-gencode" do
   user "root"
   group "root"
   creates "#{civicrm_directory}/civicrm-version.php"
-  notifies :run, resources(:execute => "civicrm-load")
+  notifies :run, "execute[civicrm-load]"
 end
 
 directory "/data/crm.osmfoundation.org/civicrm/en_US" do

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 3f99204872f92adfb665a5c23d1ed2d8bc528dc7..4b126d1061581ae280b1b91a7d1fa5c8d24783d0 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -52,5 +52,5 @@ execute "/srv/www.openstreetmap.org/rails/db/functions/Makefile" do
   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"
-  subscribes :run, resources(:git => "/srv/www.openstreetmap.org/rails")
+  subscribes :run, "git[/srv/www.openstreetmap.org/rails]"
 end

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index b96f9291e342d5566704e77cbb062d44a58d2a56..29ce0c063b8145347aeae3615c22ab7e727f8f1e 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -78,12 +78,12 @@ template "/etc/php5/fpm/pool.d/default.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "php5-fpm")
+  notifies :reload, "service[php5-fpm]"
 end
 
 file "/etc/php5/fpm/pool.d/www.conf" do
   action :delete
-  notifies :reload, resources(:service => "php5-fpm")
+  notifies :reload, "service[php5-fpm]"
 end
 
 package "phppgadmin"
@@ -117,7 +117,7 @@ search(:accounts, "*:*").each do |account|
         group "root"
         mode 0644
         variables :user => name
-        notifies :reload, resources(:service => "php5-fpm")
+        notifies :reload, "service[php5-fpm]"
       end
 
       apache_site "#{name}.dev.openstreetmap.org" do
@@ -170,7 +170,7 @@ if node[:postgresql][:clusters]["9.1/main"]
       group "apis"
       mode 0644
       variables :site => site_name
-      notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+      notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
     end
 
     apache_site site_name do

diff --git a/cookbooks/devices/recipes/default.rb b/cookbooks/devices/recipes/default.rb
index 73c1a4e9a94df14488a0be766e48acace04c02d6..8a83da46b8fd9fed238bc20e3c1168bd119eaf47 100644 (file)
--- a/cookbooks/devices/recipes/default.rb
+++ b/cookbooks/devices/recipes/default.rb
@@ -27,5 +27,5 @@ template "/etc/udev/rules.d/99-chef.rules" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "udevadm-trigger")
+  notifies :run, "execute[udevadm-trigger]"
 end

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 530fd77e40c09899c19e8d2398ee7234fc3eaee6..768ad711b248511d457d18c81990f9e2345ed6c1 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -95,7 +95,7 @@ directory "/var/lib/dns" do
   owner "git"
   group "git"
   mode 02775
-  notifies :run, resources(:execute => "dns-update")
+  notifies :run, "execute[dns-update]"
 end
 
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 219629f592a997e3a14c04c863694732fb3a6b96..61731d8e463cd6fa2589abbd069a8ea31901afc7 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -78,7 +78,7 @@ template "/etc/exim4/exim4.conf" do
   mode 0644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
-  notifies :restart, resources(:service => "exim4")
+  notifies :restart, "service[exim4]"
 end
 
 search(:accounts, "*:*").each do |account|

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 0bd74fb8e6d5d9ee37a1d864a8fc60a2ae44fe7d..09f28c9d9817025e292ac52259fd8b094b2078ba 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -27,7 +27,7 @@ end
 
 file "/etc/powerdns/pdns.d/pdns.simplebind" do
   action :delete
-  notifies :reload, resources(:service => "pdns")
+  notifies :reload, "service[pdns]"
 end
 
 template "/etc/powerdns/pdns.d/geo.conf" do
@@ -35,7 +35,7 @@ template "/etc/powerdns/pdns.d/geo.conf" do
   owner "root"
   group "root"
   mode "0600"
-  notifies :reload, resources(:service => "pdns")
+  notifies :reload, "service[pdns]"
 end
 
 directory "/etc/powerdns/zones.d" do
@@ -49,7 +49,7 @@ template "/etc/powerdns/zones.d/tile.conf" do
   owner "root"
   group "root"
   mode "0644"
-  notifies :reload, resources(:service => "pdns")
+  notifies :reload, "service[pdns]"
 end
 
 template "/etc/cron.weekly/geodns-update" do

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index f8f0ef3d4cac2b571e1d4a1b4ae1a469f8d01db4..66efbb1465627b6cf1dfd3fcb2dfcec16c46ece2 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -84,5 +84,5 @@ template "/etc/xinetd.d/git" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "xinetd")
+  notifies :reload, "service[xinetd]"
 end

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index a561681ac32c2d0ee233f95501b2f556ee9947d2..9fa225d2669d00145d9fd2e1f451f3f0225f9428 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -106,7 +106,7 @@ unless unit.nil?
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false
-    subscribes :restart, resources(:template => "/etc/init/ttyS#{unit}.conf")
+    subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
   end
 end
 
@@ -122,7 +122,7 @@ if File.exist?("/etc/default/grub")
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed
-    notifies :run, resources(:execute => "update-grub")
+    notifies :run, "execute[update-grub]"
   end
 end
 

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index d8d1434d06cdc24fd95dcc72ade820a3cfce9162..0ed312b0d3c612e8bbf128a2bbb1bf424be265ac 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -29,7 +29,7 @@ template "/etc/memcached.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "memcached")
+  notifies :restart, "service[memcached]"
 end
 
 munin_plugin_conf "memcached_multi" do

diff --git a/cookbooks/munin/definitions/munin_plugin.rb b/cookbooks/munin/definitions/munin_plugin.rb
index beee646fa2a844b4ea4f2012d3e65dda9378b18c..4704313b7a67fbc03b3986242ff0de2b076cb228 100644 (file)
--- a/cookbooks/munin/definitions/munin_plugin.rb
+++ b/cookbooks/munin/definitions/munin_plugin.rb
@@ -38,7 +38,7 @@ define :munin_plugin, :action => :create do
     link "/etc/munin/plugins/#{params[:name]}" do
       action params[:action]
       to target_path
-      notifies :restart, resources(:service => "munin-node")
+      notifies :restart, "service[munin-node]"
     end
   end
 

diff --git a/cookbooks/munin/definitions/munin_plugin_conf.rb b/cookbooks/munin/definitions/munin_plugin_conf.rb
index 63cecd0ab39ada1b80283b2a1dba3e2556e1aa18..91ad9894cd99bb04906ec7d5f95184c9a85d0cde 100644 (file)
--- a/cookbooks/munin/definitions/munin_plugin_conf.rb
+++ b/cookbooks/munin/definitions/munin_plugin_conf.rb
@@ -28,7 +28,7 @@ define :munin_plugin_conf, :action => :create, :variables => {} do
       group "root"
       mode 0644
       variables params[:variables].merge(:name => params[:name])
-      notifies :restart, resources(:service => "munin-node")
+      notifies :restart, "service[munin-node]"
     end
   else
     file "/etc/munin/plugin-conf.d/#{params[:name]}" do

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 41d722e0cdc64113ce703c9117f8423df1be0350..33f51097ea44839c2064d4ac6822eb1afcfd65eb 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -50,7 +50,7 @@ template "/etc/munin/munin-node.conf" do
   group "root"
   mode 0644
   variables :servers => servers
-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"
 end
 
 remote_directory "/usr/local/share/munin/plugins" do
@@ -73,7 +73,7 @@ remote_directory "/etc/munin/plugin-conf.d" do
   files_group "root"
   files_mode 0644
   purge false
-  notifies :restart, resources(:service => "munin-node")
+  notifies :restart, "service[munin-node]"
 end
 
 if Dir.glob("/proc/acpi/thermal_zone/*/temperature").empty?

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index d56fbdc04ba94ffc265c500d0bcca24186adabad..f9d2e2d0330f6ce0e6f6b66317e4fe3a5930cfe2 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -30,7 +30,7 @@ template "/etc/mysql/conf.d/chef.cnf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "mysql")
+  notifies :reload, "service[mysql]"
 end
 
 package "libdbd-mysql-perl"

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 9e87e2855ce147731ac3b36a3d7d490f8ab78b76..04df2495f43b1847314a65ffe9d37927f90fcaad 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -56,7 +56,7 @@ template "/etc/hostname" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "hostname")
+  notifies :run, "execute[hostname]"
 end
 
 template "/etc/hosts" do
@@ -135,7 +135,7 @@ template "/etc/default/shorewall" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/shorewall.conf" do
@@ -143,7 +143,7 @@ template "/etc/shorewall/shorewall.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/zones" do
@@ -152,7 +152,7 @@ template "/etc/shorewall/zones" do
   group "root"
   mode 0644
   variables :type => "ipv4"
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/interfaces" do
@@ -160,7 +160,7 @@ template "/etc/shorewall/interfaces" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/hosts" do
@@ -169,7 +169,7 @@ template "/etc/shorewall/hosts" do
   group "root"
   mode 0644
   variables :zones => zones
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/policy" do
@@ -177,7 +177,7 @@ template "/etc/shorewall/policy" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/rules" do
@@ -186,7 +186,7 @@ template "/etc/shorewall/rules" do
   group "root"
   mode 0644
   variables :rules => []
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 firewall_rule "limit-icmp-echo" do
@@ -217,12 +217,12 @@ if node[:roles].include?("gateway")
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"
   end
 else
   file "/etc/shorewall/masq" do
     action :delete
-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"
   end
 end
 
@@ -240,7 +240,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/shorewall6.conf" do
@@ -248,7 +248,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/zones" do
@@ -257,7 +257,7 @@ if not node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0644
     variables :type => "ipv6"
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/interfaces" do
@@ -265,7 +265,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/hosts" do
@@ -274,7 +274,7 @@ if not node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0644
     variables :zones => zones
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/policy" do
@@ -282,7 +282,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/rules" do
@@ -291,7 +291,7 @@ if not node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0644
     variables :rules => []
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   firewall_rule "limit-icmp6-echo" do

diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
index 3e13507f19514c91040daec0bf47fbddc66c62e5..508d14eca99de4a5f723400c04d067480de0b4f3 100644 (file)
--- a/cookbooks/nfs/recipes/server.rb
+++ b/cookbooks/nfs/recipes/server.rb
@@ -60,5 +60,5 @@ template "/etc/exports" do
   group "root"
   mode 0644
   variables :exports => exports
-  notifies :run, resources(:execute => "exportfs")
+  notifies :run, "execute[exportfs]"
 end

diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb
index 51228d632521a78dc58da8ae8acef70347707382..528527b07b17cdd8eec8543284087e39a206b500 100644 (file)
--- a/cookbooks/nginx/definitions/nginx_site.rb
+++ b/cookbooks/nginx/definitions/nginx_site.rb
@@ -30,14 +30,14 @@ define :nginx_site, :action => [ :create ], :variables => {} do
       group "root"
       mode 0644
       variables params[:variables].merge(:name => name, :directory => directory)
-      notifies :reload, resources(:service => "nginx")
+      notifies :reload, "service[nginx]"
     end
   end
 
   if site_action.include?(:delete)
     file "/etc/nginx/conf.d/#{name}.conf" do
       action :delete
-      notifies :restart, resources(:service => "nginx")
+      notifies :restart, "service[nginx]"
     end
   end
 end

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index cd12156d87ad3c20f88e9d650e9fca1f297f7e4f..dfa2df7c118ee3c3ddcb391ccb052472b4c94d40 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -54,7 +54,7 @@ node[:nominatim][:fpm_pools].each do |name,data|
     group "root"
     mode 0644
     variables data.merge(:name => name)
-    notifies :reload, resources(:service => "php5-fpm")
+    notifies :reload, "service[php5-fpm]"
   end
 end
 

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 938aa47aca72f4b5bb52762c9e963df993d9abe2..12447a28d6442c9626c1586cafa551953fb27457 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -35,7 +35,7 @@ file "/etc/timezone" do
   group "root"
   mode 0644
   content "#{node[:tz]}\n"
-  notifies :run, resources(:execute => "dpkg-reconfigure-tzdata"), :immediately
+  notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
 
 service "ntp" do
@@ -48,7 +48,7 @@ template "/etc/ntp.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "ntp")
+  notifies :restart, "service[ntp]"
 end
 
 munin_plugins = [ "ntp_kernel_err", "ntp_kernel_pll_freq", "ntp_kernel_pll_off", "ntp_offset" ]

diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb
index cbd45ee65c319efcb5ca224fe48e2cff67fe1f8a..fbf6af9b6109e031b1e8ad6b7e4a89a0df80dce7 100644 (file)
--- a/cookbooks/openvpn/recipes/default.rb
+++ b/cookbooks/openvpn/recipes/default.rb
@@ -69,7 +69,7 @@ node[:openvpn][:tunnels].each do |name,details|
       :port => node[:openvpn][:tunnels][name][:port],
       :mode => node[:openvpn][:tunnels][name][:mode],
       :peer => node[:openvpn][:tunnels][name][:peer]
-      notifies :restart, resources(:service => "openvpn")
+      notifies :restart, "service[openvpn]"
     end
   else
     file "/etc/openvpn/#{name}.conf" do

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 766f2f4b0760f1d41a1b085f0138fd1219c59a93..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
-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"
   end
 
   subversion "#{directory}/osqa" do
@@ -70,7 +70,7 @@ node[:osqa][:sites].each do |site|
     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
@@ -89,7 +89,7 @@ node[:osqa][:sites].each do |site|
     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|
@@ -110,6 +110,6 @@ node[:osqa][:sites].each do |site|
     group site_group
     mode 0644
     content settings
-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"
   end
 end

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 487fddf90e3cdc23c2a00bce0e28234e1d0f9d32..fa9644287da79f3dc55b5b73780bfd8fbf06b8e4 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -131,7 +131,7 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
     group "www-data"
     mode 0664
     content IO.read(distname)
-    notifies :run, resources(:execute => "/opt/otrs/bin/Cron.sh")
+    notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end
 end
 

diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb
index 819abdd789ad34cb018b6cf459012d547f830233..a1868edcf7e5d303d20af49730345c6f2102c962 100644 (file)
--- a/cookbooks/owl/recipes/default.rb
+++ b/cookbooks/owl/recipes/default.rb
@@ -97,7 +97,7 @@ execute "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile" do
   cwd "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails"
   user "root"
   group "root"
-  notifies :touch, resources(:file => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt")
+  notifies :touch, "file[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt]"
 end
 
 git "/srv/owl.openstreetmap.org/openstreetmap-watch-list" do
@@ -106,7 +106,7 @@ git "/srv/owl.openstreetmap.org/openstreetmap-watch-list" do
   revision "owl.osm.org"
   user "owl"
   group "owl"
-  notifies :run, resources(:execute => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile")
+  notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
 end
 
 directory "srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp" do
@@ -124,7 +124,7 @@ template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/datab
   owner "owl"
   group "owl"
   mode 0664
-  notifies :run, resources(:execute => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile")
+  notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
   only_if { node[:postgresql][:clusters]["9.1/main"] }
 end
 

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 4cf4b0bda6347981f93dfb6517afb422541ee40e..9dfde244856f3fbc2d2baccb0f9c650912e57d33 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -39,7 +39,7 @@ node[:postgresql][:versions].each do |version|
     group "postgres"
     mode 0644
     variables :version => version, :defaults => defaults, :settings => settings
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
@@ -49,7 +49,7 @@ node[:postgresql][:versions].each do |version|
     mode 0640
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
@@ -58,7 +58,7 @@ node[:postgresql][:versions].each do |version|
     group "postgres"
     mode 0640
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
-    notifies :reload, resources(:service => "postgresql")
+    notifies :reload, "service[postgresql]"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
@@ -79,12 +79,12 @@ node[:postgresql][:versions].each do |version|
       group "postgres"
       mode 0640
       variables :defaults => defaults, :settings => settings
-      notifies :reload, resources(:service => "postgresql")
+      notifies :reload, "service[postgresql]"
     end
   else
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       action :delete
-      notifies :reload, resources(:service => "postgresql")
+      notifies :reload, "service[postgresql]"
     end
   end
 end

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 56eb2f6ff64b2eb32588374cf23d54cb5a6d862b..44fef331e032bfb95744cff19ea390e9905ca765 100644 (file)
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -52,7 +52,7 @@ template "/etc/default/rsync" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "rsync")
+  notifies :restart, "service[rsync]"
 end
 
 template "/etc/rsyncd.conf" do

diff --git a/cookbooks/snmpd/recipes/default.rb b/cookbooks/snmpd/recipes/default.rb
index c6746678563c2cd01588d9b4065c21438fa483fa..ef6094b01a053299d2c83c3577b90babf017bbb3 100644 (file)
--- a/cookbooks/snmpd/recipes/default.rb
+++ b/cookbooks/snmpd/recipes/default.rb
@@ -34,7 +34,7 @@ template "/etc/snmp/snmpd.conf" do
   group "root"
   mode 0600
   variables :communities => communities
-  notifies :restart, resources(:service => "snmpd")
+  notifies :restart, "service[snmpd]"
 end
 
 node[:snmpd][:clients].each do |address|

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index ec1109c763447185fa0d50af7914b2a8a905b6b1..e9150a55d219d6851fa8af05e82d9c90c9a9d7d2 100644 (file)
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -29,7 +29,7 @@ template "/etc/default/spamassassin" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "spamassassin")
+  notifies :restart, "service[spamassassin]"
 end
 
 trusted_networks = node[:exim][:relay_from_hosts]
@@ -48,5 +48,5 @@ template "/etc/spamassassin/local.cf" do
   group "root"
   mode 0644
   variables :trusted_networks => trusted_networks.sort
-  notifies :restart, resources(:service => "spamassassin")
+  notifies :restart, "service[spamassassin]"
 end

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 6452f67af5b71122f5cd9eb071d2630f975267dd..ce8ec8c9e245d041a4ef8d906fc35c3f0d126c26 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -43,9 +43,9 @@ end
 service "squid" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
-  subscribes :reload, resources(:template => "/etc/squid/squid.conf")
-  subscribes :restart, resources(:template => "/etc/default/squid")
-  subscribes :reload, resources(:template => "/etc/resolv.conf")
+  subscribes :reload, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/default/squid]"
+  subscribes :reload, "template[/etc/resolv.conf]"
 end
 
 munin_plugin "squid_cache"

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 380e747b90610cf3443f93b2dc18e9ffd13e41ae..d2797a289af5db4943627630739dece3b7bf5aa9 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -37,7 +37,7 @@ template "/etc/sysctl.d/60-chef.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "sysctl")
+  notifies :run, "execute[sysctl]"
 end
 
 node[:sysctl].each_value do |group|

diff --git a/cookbooks/sysfs/recipes/default.rb b/cookbooks/sysfs/recipes/default.rb
index c6eb15ff5ae78757c6fae9da7584fb762a05515f..b9b5faff3a72846a7c1225ef314be258e451b9a6 100644 (file)
--- a/cookbooks/sysfs/recipes/default.rb
+++ b/cookbooks/sysfs/recipes/default.rb
@@ -29,5 +29,5 @@ template "/etc/sysfs.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "sysfsutils")
+  notifies :restart, "service[sysfsutils]"
 end

diff --git a/cookbooks/thinkup/recipes/default.rb b/cookbooks/thinkup/recipes/default.rb
index 25864460f4525973c656e256037af3a42e8d60ff..c7b6ed23f71c39f3370e4698162c597197bd3653 100644 (file)
--- a/cookbooks/thinkup/recipes/default.rb
+++ b/cookbooks/thinkup/recipes/default.rb
@@ -50,7 +50,7 @@ git "/srv/thinkup.openstreetmap.org" do
   revision "v1.2.1"
   user "root"
   group "root"
-  notifies :reload, resources(:service => "apache2")
+  notifies :reload, "service[apache2]"
 end
 
 directory "/srv/thinkup.openstreetmap.org/logs" do
@@ -92,7 +92,7 @@ file "/srv/thinkup.openstreetmap.org/webapp/config.inc.php" do
   group "root"
   mode 0644
   content thinkup_config
-  notifies :reload, resources(:service => "apache2")
+  notifies :reload, "service[apache2]"
 end
 
 thinkup_cron = edit_file "/srv/thinkup.openstreetmap.org/extras/cron/config.sample" do |line|

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 03c850dc931ac3ddf365b9cbe72436f64851c7fd..9f54d530dbec066d8f3e27af17986e4d0e617f24 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -77,8 +77,8 @@ template "/etc/renderd.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "apache2")
-  notifies :restart, resources(:service => "renderd")
+  notifies :reload, "service[apache2]"
+  notifies :restart, "service[renderd]"
 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do
@@ -186,7 +186,7 @@ node[:tile][:data].each do |name,data|
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"
-      subscribes :run, resources(:execute => file), :immediately
+      subscribes :run, "execute[#{file}]", :immediately
     end
   end
 
@@ -195,7 +195,7 @@ node[:tile][:data].each do |name,data|
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
     user "tile"
     group "tile"
-    subscribes :run, resources(:execute => file), :immediately
+    subscribes :run, "execute[#{file}]", :immediately
   end
 
   remote_file file do
@@ -211,8 +211,8 @@ node[:tile][:data].each do |name,data|
     group "tile"
     mode 0644
     backup false
-    notifies :run, resources(:execute => file), :immediately
-    notifies :restart, resources(:service => "renderd")
+    notifies :run, "execute[#{file}]", :immediately
+    notifies :restart, "service[renderd]"
   end
 end
 
@@ -461,8 +461,8 @@ end
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true
-  subscribes :restart, resources(:template => "/usr/local/bin/replicate")
-  subscribes :restart, resources(:template => "/etc/init.d/replicate")
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "template[/etc/init.d/replicate]"
 end
 
 template "/etc/logrotate.d/replicate" do

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index be6e0be2260f12718ee13aeab8c1eb2a04c76e80..dbc5c32107a6dbcf4b3be501b2e960cd18c5a508 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -83,8 +83,8 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd rails_directory
     user rails_user
     group rails_group
-    notifies :delete, resources(:file => "#{rails_directory}/public/export/embed.html")
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
+    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
   end
 
   execute "#{rails_directory}/db/migrate" do
@@ -93,7 +93,7 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd rails_directory
     user rails_user
     group rails_group
-    notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+    notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 
   execute "#{rails_directory}/Gemfile" do
@@ -103,11 +103,11 @@ define :rails_port, :action => [ :create, :enable ] do
     user "root"
     group "root"
     if run_migrations
-      notifies :run, resources(:execute => "#{rails_directory}/db/migrate")
+      notifies :run, "execute[#{rails_directory}/db/migrate]"
     else
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
-    subscribes :run, resources(:gem_package => "bundler#{ruby_version}")
+    subscribes :run, "gem_package[bundler#{ruby_version}]"
   end
 
   directory rails_directory do
@@ -122,7 +122,7 @@ define :rails_port, :action => [ :create, :enable ] do
     revision rails_revision
     user rails_user
     group rails_group
-    notifies :run, resources(:execute => "#{rails_directory}/Gemfile")
+    notifies :run, "execute[#{rails_directory}/Gemfile]"
   end
 
   directory "#{rails_directory}/tmp" do
@@ -142,7 +142,7 @@ define :rails_port, :action => [ :create, :enable ] do
     group rails_group
     mode 0664
     variables database_params
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
@@ -213,7 +213,7 @@ define :rails_port, :action => [ :create, :enable ] do
     group rails_group
     mode 0664
     content application_yml
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
   end
 
   if params[:piwik_configuration]
@@ -222,12 +222,12 @@ define :rails_port, :action => [ :create, :enable ] do
       group rails_group
       mode 0664
       content YAML.dump(params[:piwik_configuration])
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
   else
     file "#{rails_directory}/config/piwik.yml" do
       action :delete
-      notifies :run, resources(:execute => "#{rails_directory}/public/assets")
+      notifies :run, "execute[#{rails_directory}/public/assets]"
     end
   end
 
@@ -250,7 +250,7 @@ define :rails_port, :action => [ :create, :enable ] do
       File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") and
       File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
     end
-    notifies :touch, resources(:file => "#{rails_directory}/tmp/restart.txt")
+    notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
   end
 
   template "/etc/cron.daily/rails-#{name}" do

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index c1f8e894e90390c2f770b7e4c84c53ca2a9f0c2f..ac8acff603a77192d707810c08d05cbea6b8fc6a 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -53,7 +53,7 @@ execute "cgimap-configure" do
   cwd cgimap_directory
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-build"), :immediate
+  notifies :run, "execute[cgimap-build]", :immediate
 end
 
 execute "cgimap-autogen" do
@@ -62,7 +62,7 @@ execute "cgimap-autogen" do
   cwd cgimap_directory
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-configure"), :immediate
+  notifies :run, "execute[cgimap-configure]", :immediate
 end
 
 git cgimap_directory do
@@ -71,7 +71,7 @@ git cgimap_directory do
   revision "live"
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-autogen"), :immediate
+  notifies :run, "execute[cgimap-autogen]", :immediate
 end
 
 if node[:web][:readonly_database_host]
@@ -115,7 +115,7 @@ else
   service "cgimap" do
     action [ :enable, :start ]
     supports :restart => true, :reload => true
-    subscribes :restart, resources(:execute => "cgimap-build")
-    subscribes :restart, resources(:file => "/etc/init.d/cgimap")
+    subscribes :restart, "execute[cgimap-build]"
+    subscribes :restart, "file[/etc/init.d/cgimap]"
   end
 end

diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index c5d0088f87198091e68ce757059df709ce070cc1..b2117dde9cc466bb2176f9adb51f5e3a35cb5be9 100644 (file)
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -50,7 +50,7 @@ git gpx_directory do
   revision "live"
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "gpx-import-build"), :immediate
+  notifies :run, "execute[gpx-import-build]", :immediate
 end
 
 template "/etc/init.d/gpx-import" do
@@ -75,7 +75,7 @@ else
   service "gpx-import" do
     action [ :enable, :start ]
     supports :restart => true, :reload => true
-    subscribes :restart, resources(:execute => "gpx-import-build")
-    subscribes :restart, resources(:template => "/etc/init.d/gpx-import")
+    subscribes :restart, "execute[gpx-import-build]"
+    subscribes :restart, "template[/etc/init.d/gpx-import]"
   end
 end