Remove version from rake when invoking it via bundle

[chef.git] / cookbooks / web / recipes / gpx.rb

diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index c5d0088f87198091e68ce757059df709ce070cc1..7806530d97f9c216ce2327e71593ce5c1195e2aa 100644 (file)
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -50,32 +50,32 @@ 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
   source "init.gpx.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   variables :gpx_directory => gpx_directory,
             :pid_directory => pid_directory,
             :log_directory => log_directory,
-            :database_host =>  node[:web][:database_host],
+            :database_host => node[:web][:database_host],
             :database_name => "openstreetmap",
             :database_username => "gpximport",
             :database_password => db_passwords["gpximport"]
 end
 
-if ["database_offline", "database_readonly", "gpx_offline"].include?(node[:web][:status])
+if %w(database_offline database_readonly gpx_offline).include?(node[:web][:status])
   service "gpx-import" do
     action :stop
   end
 else
   service "gpx-import" do
-    action [ :enable, :start ]
+    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