Fix more rubocop detected style issues

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 0d653c6381a37f99ba1ff20b8d8e1dd823b8f310..ae1b7945603596c379ad65f60de13ac15e4dedc6 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,66 +17,271 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "postgresql"
 include_recipe "postgresql"

+include_recipe "git"

 
 package "php5"
 package "php5-cli"
 package "php5-pgsql"
 
 package "php5"
 package "php5-cli"
 package "php5-pgsql"

-
+package "php5-fpm"
+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"]
+
+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
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"

-  directory "/home/lonvia/nominatim"
+  directory source_directory
+  variables :pools => node[:nominatim][:fpm_pools]

 end
 
 end
 

-template "/etc/php5/fpm/pool.d/www.conf" do
-  source "fpm.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  variables :name => "www", :pm => "dynamic", :max_children => "50"
-  notifies :reload, resources(:service => "php5-fpm")
+apache_site "default" do
+  action [ :disable ]

 end
 
 end
 

-template "/etc/php5/fpm/pool.d/bulk.conf" do
-  source "fpm.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  variables :name => "bulk", :pm => "static", :max_children => "7"
-  notifies :reload, resources(:service => "php5-fpm")
+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
+    variables data.merge(:name => name, :port => data[:port])
+    notifies :reload, "service[php5-fpm]"
+  end

 end
 
 postgresql_user "tomh" do
 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
+  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
+  owner "nominatim"
+  group "nominatim"
+  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 "postgresql-#{database_version}-postgis-#{postgis_version}"
+package "postgresql-server-dev-#{database_version}"
+package "build-essential"
+package "libxml2-dev"
+package "libgeos-dev"
+package "libgeos++-dev"
+package "libpq-dev"
+package "libbz2-dev"
+package "libtool"
+package "automake"
+package "libproj-dev"
+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"
+  not_if { File.exist?("/usr/share/php/DB") }
+end
+
+execute "compile_nominatim" do
+  action :nothing
+  command "cd #{source_directory} && ./autogen.sh && ./configure && make"
+  user "nominatim"
+end
+
+git source_directory do
+  action :checkout
+  repository node[:nominatim][:repository]
+  enable_submodules true
+  user "nominatim"
+  group "nominatim"
+  notifies :run, "execute[compile_nominatim]"
+end
+
+directory "#{source_directory}/log" do
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
+end
+
+template "#{source_directory}/.git/hooks/post-merge" do
+  source "update_source.erb"
+  owner  "nominatim"
+  group  "nominatim"
+  mode   0755
+  variables :source_directory => source_directory
+end
+
+template "#{source_directory}/settings/local.php" do
+  source "nominatim.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode 0664
+  variables :postgres_version => database_version
+end
+
+template "#{source_directory}/settings/ip_blocks.conf" do
+  action :create_if_missing
+  source "ipblocks.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode 0664
+end
+
+file "#{source_directory}/settings/apache_blocks.conf" do
+  action :create_if_missing
+  owner "nominatim"
+  group "nominatim"
+  mode 0664
+end
+
+file "#{source_directory}/settings/ip_blocks.map" do
+  action :create_if_missing
+  owner "nominatim"
+  group "nominatim"
+  mode 0664
+end
+
+if node[:nominatim][:enabled]
+  cron_action = :create
+else
+  cron_action = :delete
+end
+
+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
+
+template "#{source_directory}/utils/nominatim-update" do
+  source "updater.erb"
+  user   "nominatim"
+  group  "nominatim"
+  mode   0755
+end
+
+template "/etc/init.d/nominatim-update" do
+  source "updater.init.erb"
+  user   "nominatim"
+  group  "nominatim"
+  mode   0755
+  variables :source_directory => source_directory
+end
+
+munin_plugin_conf "nominatim" do
+  template "munin.erb"
+end
+
+munin_plugin "nominatim_importlag" do
+  target "#{source_directory}/munin/nominatim_importlag"
+end
+
+munin_plugin "nominatim_query_speed" do
+  target "#{source_directory}/munin/nominatim_query_speed_querylog"
+end
+
+munin_plugin "nominatim_requests" do
+  target "#{source_directory}/munin/nominatim_requests_querylog"
+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
 end