Remove trailing whitespace in ruby code

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 845bb7700bcf2383c674e8126438440d3531bf12..ab4e6e15ed2d270d85dd5663412f9eca4d09fda6 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
+include_recipe "apache::ssl"

 include_recipe "postgresql"
 include_recipe "git"
 
 include_recipe "postgresql"
 include_recipe "git"
 


@@ -29,13 +29,21 @@ package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
 package "php-apc"
 
 apache_module "rewrite"

-apache_module "fastcgi-handler"
+apache_module "proxy"
+apache_module "proxy_fcgi"

 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

+database_cluster = node[:nominatim][:database][:cluster]
+database_version = database_cluster.sub(/\/.*/, "")
+database_name = node[:nominatim][:database][:dbname]
+
+postgis_version = node[:nominatim][:database][:postgis]
+

 service "php5-fpm" do
 service "php5-fpm" do

+  provider Chef::Provider::Service::Upstart

   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end


@@ -46,45 +54,48 @@ apache_site "nominatim.openstreetmap.org" do
   variables :pools => node[:nominatim][:fpm_pools]
 end
 
   variables :pools => node[:nominatim][:fpm_pools]
 end
 

-node[:nominatim][:fpm_pools].each do |name,data|
+apache_site "default" do
+  action [ :disable ]
+end

 
 

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

   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0644
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0644

-    variables data.merge(:name => name)
-    notifies :reload, resources(:service => "php5-fpm")
+    variables data.merge(:name => name, :port => data[:port])
+    notifies :reload, "service[php5-fpm]"

   end
 end
 
 postgresql_user "tomh" do
   end
 end
 
 postgresql_user "tomh" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "lonvia" do
   superuser true
 end
 
 postgresql_user "lonvia" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "twain" do
   superuser true
 end
 
 postgresql_user "twain" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "nominatim" do
   superuser true
 end
 
 postgresql_user "nominatim" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "www-data" do
   superuser true
 end
 
 postgresql_user "www-data" do

-  cluster "9.1/main"
+  cluster database_cluster

 end
 
 postgresql_munin "nominatim" do
 end
 
 postgresql_munin "nominatim" do

-  cluster "9.1/main"
-  database "nominatim"
+  cluster database_cluster
+  database database_name

 end
 
 directory "/var/log/nominatim" do
 end
 
 directory "/var/log/nominatim" do


@@ -93,12 +104,20 @@ directory "/var/log/nominatim" do
   mode 0755
 end
 
   mode 0755
 end
 

+template "/etc/logrotate.d/nominatim" do
+  source "logrotate.nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+

 package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"
 package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"

-package "postgresql-9.1-postgis"
-package "postgresql-server-dev-9.1"
+package "postgresql-#{database_version}-postgis-#{postgis_version}"
+package "postgresql-server-dev-#{database_version}"

 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"
 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"


@@ -111,10 +130,14 @@ package "libproj-dev"
 package "libprotobuf-c0-dev"
 package "protobuf-c-compiler"
 package "python-psycopg2"
 package "libprotobuf-c0-dev"
 package "protobuf-c-compiler"
 package "python-psycopg2"

+package "libboost-dev"
+package "libboost-system-dev"
+package "libboost-filesystem-dev"
+package "libboost-thread-dev"

 
 execute "php-pear-db" do
   command "pear install DB"
 
 execute "php-pear-db" do
   command "pear install DB"

-  not_if { File.exists?("/usr/share/php/DB") }
+  not_if { File.exist?("/usr/share/php/DB") }

 end
 
 execute "compile_nominatim" do
 end
 
 execute "compile_nominatim" do


@@ -152,6 +175,7 @@ template "#{source_directory}/settings/local.php" do
   owner "nominatim"
   group "nominatim"
   mode 0664
   owner "nominatim"
   group "nominatim"
   mode 0664

+  variables :postgres_version => database_version

 end
 
 template "#{source_directory}/settings/ip_blocks.conf" do
 end
 
 template "#{source_directory}/settings/ip_blocks.conf" do


@@ -176,38 +200,21 @@ file "#{source_directory}/settings/ip_blocks.map" do
   mode 0664
 end
 
   mode 0664
 end
 

-cron "nominatim_logrotate" do
-  hour "5"
-  minute "30"
-  weekday "0"
-  command "#{source_directory}/utils/cron_logrotate.sh"
-  user "nominatim"
-  mailto email_errors
+if node[:nominatim][:enabled]
+  cron_action = :create
+else
+  cron_action = :delete

 end
 
 end
 

-cron "nominatim_banip" do
-  command "#{source_directory}/utils/cron_banip.py"
-  user "nominatim"
-  mailto email_errors
+template "/etc/cron.d/nominatim" do
+  action cron_action
+  source "cron.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+  variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors

 end
 
 end
 

-cron "nominatim_vacuum" do
-  hour "2"
-  minute "00"
-  command "#{source_directory}/utils/cron_vacuum.sh"
-  user "nominatim"
-  mailto email_errors
-end
-
-['search', 'reverse'].each do |filename|
-  ['phpj', 'phpx'].each do |ext|
-    link "#{source_directory}/website/#{filename}.#{ext}" do
-      to "#{source_directory}/website/#{filename}.php"
-      user "nominatim"
-      group "nominatim"
-    end
-  end
-end

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


@@ -233,13 +240,51 @@ munin_plugin "nominatim_importlag" do
 end
 
 munin_plugin "nominatim_query_speed" do
 end
 
 munin_plugin "nominatim_query_speed" do

-  target "#{source_directory}/munin/nominatim_query_speed"
+  target "#{source_directory}/munin/nominatim_query_speed_querylog"

 end
 
 munin_plugin "nominatim_requests" do
 end
 
 munin_plugin "nominatim_requests" do

-  target "#{source_directory}/munin/nominatim_requests"
+  target "#{source_directory}/munin/nominatim_requests_querylog"

 end
 
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 end
 
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 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"
+  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"
+  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"
+  owner  "nominatim"
+  group  "nominatim"
+  mode   0644
+end
+
+template "/usr/local/bin/backup-nominatim" do
+  source "backup-nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+directory File.dirname(node[:nominatim][:flatnode_file]) do
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
+  recursive true
+end