fix typos

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 0d653c6381a37f99ba1ff20b8d8e1dd823b8f310..f6a57a8efc7d78047bed6e9ac42e404e9e485c1a 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -19,16 +19,22 @@
 
 include_recipe "apache"
 include_recipe "postgresql"
+include_recipe "git"
 
 package "php5"
 package "php5-cli"
 package "php5-pgsql"
-
+package "php5-fpm"
+package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
 apache_module "fastcgi-handler"
 
+home_directory = data_bag_item("accounts", "nominatim")["home"]
+source_directory = "#{home_directory}/nominatim"
+email_errors = data_bag_item("accounts", "lonvia")["email"]
+
 service "php5-fpm" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
@@ -37,24 +43,19 @@ end
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory "/home/lonvia/nominatim"
+  variables :pools => node[:nominatim][:fpm_pools]
 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")
-end
+node[:nominatim][:fpm_pools].each do |name,data|
 
-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")
+  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")
+  end
 end
 
 postgresql_user "tomh" do
@@ -72,6 +73,11 @@ postgresql_user "twain" do
   superuser true
 end
 
+postgresql_user "nominatim" do
+  cluster "9.1/main"
+  superuser true
+end
+
 postgresql_user "www-data" do
   cluster "9.1/main"
 end
@@ -80,3 +86,140 @@ postgresql_munin "nominatim" do
   cluster "9.1/main"
   database "nominatim"
 end
+
+directory "/var/log/nominatim" do
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
+end
+
+package "osmosis"
+package "gcc"
+package "proj-bin"
+package "libgeos-c1"
+package "postgresql-9.1-postgis"
+package "postgresql-server-dev-9.1"
+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"
+
+execute "php-pear-db" do
+  command "pear install DB"
+  not_if { File.exists?("/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
+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
+
+cron "nominatim_logrotate" do
+  hour "5"
+  minute "30"
+  weekday "0"
+  command "#{source_directory}/utils/cron_logrotate.sh"
+  user "nominatim"
+  mailto email_errors
+end
+
+cron "nominatim_banip" do
+  command "#{source_directory}/utils/cron_banip.py"
+  user "nominatim"
+  mailto email_errors
+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"
+  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
+