X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3acb5c42fb0b3963eafa4e542d11b2a48b99cefc..229bfd4d1ef647515f13b6e8e064a957881f2ca7:/cookbooks/web/recipes/cgimap.rb

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 4a8ab12c1..365c2b560 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -92,7 +92,7 @@ cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
   line.gsub!(/^CGIMAP_LOGFILE=.*;/, "CGIMAP_LOGFILE=#{log_directory}/cgimap.log;")
   line.gsub!(/^CGIMAP_MEMCACHE=.*;/, "CGIMAP_MEMCACHE=rails1,rails2,rails3;")
 
-  line.gsub!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
+  line.gsub!(%r{/home/rails/bin/map}, "#{cgimap_directory}/map")
 
   if database_readonly
     line.gsub!(/--daemon/, "--daemon --readonly")
@@ -108,13 +108,13 @@ file "/etc/init.d/cgimap" do
   content cgimap_init
 end
 
-if ["database_offline", "api_offline"].include?(node[:web][:status])
+if %w(database_offline api_offline).include?(node[:web][:status])
   service "cgimap" do
     action :stop
   end
 else
   service "cgimap" do
-    action [ :enable, :start ]
+    action [:enable, :start]
     supports :restart => true, :reload => true
     subscribes :restart, "execute[cgimap-build]"
     subscribes :restart, "file[/etc/init.d/cgimap]"