Rescue LoadError explicitly as it doesn't inherit from StandardError

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 2259c9da79f5114f7142fe3d031c16656ec0d921..6134c1d7674cc27d10d9fe744d731838ab9bea54 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -44,7 +44,7 @@ postgis_version = node[:nominatim][:database][:postgis]
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -55,7 +55,7 @@ apache_site "nominatim.openstreetmap.org" do
 end
 
 apache_site "default" do
 end
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|


@@ -111,7 +111,6 @@ template "/etc/logrotate.d/nominatim" do
   mode 0644
 end
 
   mode 0644
 end
 

-

 package "osmosis"
 package "gcc"
 package "proj-bin"
 package "osmosis"
 package "gcc"
 package "proj-bin"


@@ -161,12 +160,11 @@ directory "#{source_directory}/log" do
   mode 0755
 end
 
   mode 0755
 end
 

-

 template "#{source_directory}/.git/hooks/post-merge" do
   source "update_source.erb"
 template "#{source_directory}/.git/hooks/post-merge" do
   source "update_source.erb"

-  owner  "nominatim"
-  group  "nominatim"
-  mode   0755
+  owner "nominatim"
+  group "nominatim"
+  mode 0755

   variables :source_directory => source_directory
 end
 
   variables :source_directory => source_directory
 end
 


@@ -215,19 +213,18 @@ template "/etc/cron.d/nominatim" do
   variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
 end
 
   variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
 end
 

-

 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"

-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
+  user "nominatim"
+  group "nominatim"
+  mode 0755

 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"

-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
+  user "nominatim"
+  group "nominatim"
+  mode 0755

   variables :source_directory => source_directory
 end
 
   variables :source_directory => source_directory
 end
 


@@ -254,25 +251,25 @@ end
 remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do
   action :create_if_missing
   source "http://www.nominatim.org/data/wikipedia_article.sql.bin"
 remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do
   action :create_if_missing
   source "http://www.nominatim.org/data/wikipedia_article.sql.bin"

-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
+  owner "nominatim"
+  group "nominatim"
+  mode 0644

 end
 
 remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do
   action :create_if_missing
   source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin"
 end
 
 remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do
   action :create_if_missing
   source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin"

-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
+  owner "nominatim"
+  group "nominatim"
+  mode 0644

 end
 
 remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do
   action :create_if_missing
   source "http://www.nominatim.org/data/gb_postcode_data.sql.gz"
 end
 
 remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do
   action :create_if_missing
   source "http://www.nominatim.org/data/gb_postcode_data.sql.gz"

-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
+  owner "nominatim"
+  group "nominatim"
+  mode 0644

 end
 
 template "/usr/local/bin/backup-nominatim" do
 end
 
 template "/usr/local/bin/backup-nominatim" do