Merge pull request #334 from Tigerfell/tiles

remove SlippyMap extension from all wikis

diff --git a/Gemfile.lock b/Gemfile.lock
index 03b5cad9f0392e075277f37bd927496f877972c2..7c802b7cc2827b799ff00936b9d8df0ede96a14c 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
     chef-utils (16.3.45)
-    cookstyle (6.15.5)
+    cookstyle (6.15.9)
       rubocop (= 0.89.1)
     diff-lcs (1.4.4)
     docker-api (1.34.2)

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index b0717ef540eb96abb441cba3dbc7efb15ea69397..6943b0f3a32448968d0859771de4321a57e74ed1 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -21,6 +21,8 @@ include_recipe "wordpress"
 include_recipe "mysql"
 
 package %w[
+  php-xml
+  php-curl
   rsync
   unzip
   wkhtmltopdf

diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb
index 7657504855a86855476ab00ec095d2ec8a3ac1a3..00a3d6c7d1a4b2faa0c0ab644b8a646dc7591fca 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -20,6 +20,9 @@
 include_recipe "apache"
 include_recipe "php::fpm"
 
+apache_module "proxy"
+apache_module "proxy_fcgi"
+
 directory "/srv/dmca.openstreetmap.org" do
   owner "root"
   group "root"

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 9d08b478bb104cf67e48dc133fb0621118ae24d1..daa31fe4c0581cdba6ea18fa750dd5700d175ab9 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -31,6 +31,8 @@ package %w[
 ]
 
 apache_module "headers"
+apache_module "proxy"
+apache_module "proxy_fcgi"
 
 passwords = data_bag_item("donate", "passwords")
 

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 77f956b69fd1c7b21e4ac8e7d5ef6f4c055bc17b..642d6be5e5b624529cb4353fb026e653f6d24ef1 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -96,4 +96,6 @@ link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end
 
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 7972f380fe851b7464f13ebb4d5afecec6bfe108..cba2f68901320559e78c4a15dfda5fdc8caa15c4 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -98,6 +98,33 @@ node[:taginfo][:sites].each do |site|
     mode "755"
   end
 
+  git "#{directory}/taginfo-tools" do
+    action :sync
+    repository "https://github.com/taginfo/taginfo-tools.git"
+    revision "osmorg-taginfo-live"
+    depth 1
+    enable_submodules true
+    user "taginfo"
+    group "taginfo"
+  end
+
+  directory "#{directory}/build" do
+    owner "taginfo"
+    group "taginfo"
+    mode "755"
+  end
+
+  execute "compile_taginfo_tools" do
+    action :nothing
+    user "taginfo"
+    group "taginfo"
+    cwd "#{directory}/build"
+    command "cmake #{directory}/taginfo-tools && make"
+    subscribes :run, "apt_package[libprotozero-dev]"
+    subscribes :run, "apt_package[libosmium2-dev]"
+    subscribes :run, "git[#{directory}/taginfo-tools]"
+  end
+
   git "#{directory}/taginfo" do
     action :sync
     repository "https://github.com/taginfo/taginfo.git"
@@ -122,7 +149,7 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["download"] = ""
     settings["sources"]["create"] = "db languages projects wiki"
     settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.pbf"
-    settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
+    settings["sources"]["db"]["bindir"] = "#{directory}/build/src"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     JSON.pretty_generate(settings)
@@ -136,18 +163,6 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "service[apache2]"
   end
 
-  execute "#{directory}/taginfo/tagstats/Makefile" do
-    action :nothing
-    command "make"
-    cwd "#{directory}/taginfo/tagstats"
-    user "taginfo"
-    group "taginfo"
-    subscribes :run, "apt_package[libprotozero-dev]"
-    subscribes :run, "apt_package[libosmium2-dev]"
-    subscribes :run, "git[#{directory}/taginfo]"
-    notifies :restart, "service[apache2]"
-  end
-
   execute "#{directory}/taginfo/Gemfile" do
     action :nothing
     command "bundle#{ruby_version} install"

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index ba9799c4c7685e91c6d253fd5da73f992d0c0409..8a6b23b2878390818d7555248afe40d29c433bc8 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -27,18 +27,14 @@ package "openstreetmap-cgimap-bin" do
   action :upgrade
 end
 
-if node[:web][:readonly_database_host]
-  database_host = node[:web][:readonly_database_host]
-  database_readonly = true
-else
-  database_host = node[:web][:database_host]
-  database_readonly = node[:web][:status] == "database_readonly"
-end
+database_host = if node[:web][:readonly_database_host]
+                  node[:web][:readonly_database_host]
+                else
+                  node[:web][:database_host]
+                end
 
 memcached_servers = node[:web][:memcached_servers] || []
 
-switches = database_readonly ? " --readonly" : ""
-
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"
@@ -54,7 +50,7 @@ systemd_service "cgimap" do
                    "CGIMAP_RATELIMIT" => "204800",
                    "CGIMAP_MAXDEBT" => "250"
   user "rails"
-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30"
   exec_reload "/bin/kill -HUP $MAINPID"
   private_tmp true
   private_devices true

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 823bf5201b4868cddf4a766b311b885b953741d6..73f6f353e4303f32974dcdba471bfa66e99c04fa 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -29,6 +29,8 @@ package %w[
   php-mysql
 ]
 
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"
 
 fail2ban_filter "wordpress" do

diff --git a/roles/equinix.rb b/roles/equinix.rb
index 85b11110619aff348748cf412b549935eef28f92..781772cb7f45f87f490ad21ac945a44cf42a52d9 100644 (file)
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -32,7 +32,7 @@ default_attributes(
   :web => {
     :backends => %w[rails1 rails2 rails3],
     :fileserver => "ironbelly",
-    :readonly_database_host => "karm.ams.openstreetmap.org",
+    :readonly_database_host => "snap-01.ams.openstreetmap.org",
     :primary_cluster => true
   }
 )

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index cabb80f4896212219a13e3aac9b9dfbe0719fd5c..cb68665420458e7b18f36ca06547f75d55b84268 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -75,7 +75,7 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-        "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "196608"
       }
     }
   }