X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/398d8db898e976149136d5ca675e3c08dee6ee76..41487eea939ced6fb053fac4f68f77a314e4dfa5:/cookbooks/stateofthemap/recipes/default.rb

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 69f9a6e0a..3d2348da6 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -45,7 +45,7 @@ end
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 wordpress_site "2007.stateofthemap.org" do
@@ -55,6 +55,7 @@ wordpress_site "2007.stateofthemap.org" do
   database_user "sotm2007"
   database_password passwords["sotm2007"]
   database_prefix "wp_sotm_"
+  fpm_prometheus_port 12007
 end
 
 wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
@@ -72,7 +73,7 @@ end
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 wordpress_site "2008.stateofthemap.org" do
@@ -82,6 +83,7 @@ wordpress_site "2008.stateofthemap.org" do
   database_user "sotm2008"
   database_password passwords["sotm2008"]
   database_prefix "wp_sotm08_"
+  fpm_prometheus_port 12008
 end
 
 wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
@@ -99,7 +101,7 @@ end
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/2009.stateofthemap.org" do
@@ -120,6 +122,7 @@ wordpress_site "2009.stateofthemap.org" do
   urls "/register" => "/srv/2009.stateofthemap.org/register",
        "/register-pro-user" => "/srv/2009.stateofthemap.org/register-pro-user",
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
+  fpm_prometheus_port 12009
 end
 
 wordpress_theme "2009.stateofthemap.org-aerodrome" do
@@ -137,7 +140,7 @@ end
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/2010.stateofthemap.org" do
@@ -156,6 +159,7 @@ wordpress_site "2010.stateofthemap.org" do
   database_user "sotm2010"
   database_password passwords["sotm2010"]
   urls "/register" => "/srv/2010.stateofthemap.org/register"
+  fpm_prometheus_port 12010
 end
 
 wordpress_theme "2010.stateofthemap.org-aerodrome" do
@@ -169,7 +173,7 @@ wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }
+  not_if { kitchen? }
 end
 
 wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
@@ -180,7 +184,7 @@ end
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/2011.stateofthemap.org" do
@@ -199,6 +203,7 @@ wordpress_site "2011.stateofthemap.org" do
   database_user "sotm2011"
   database_password passwords["sotm2011"]
   urls "/register" => "/srv/2011.stateofthemap.org/register"
+  fpm_prometheus_port 12011
 end
 
 wordpress_theme "2011.stateofthemap.org-aerodrome" do
@@ -212,7 +217,7 @@ wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }
+  not_if { kitchen? }
 end
 
 wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
@@ -223,7 +228,7 @@ end
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/2012.stateofthemap.org" do
@@ -242,6 +247,7 @@ wordpress_site "2012.stateofthemap.org" do
   database_user "sotm2012"
   database_password passwords["sotm2012"]
   urls "/register" => "/srv/2012.stateofthemap.org/register"
+  fpm_prometheus_port 12012
 end
 
 wordpress_theme "2012.stateofthemap.org-aerodrome" do
@@ -260,7 +266,7 @@ wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }
+  not_if { kitchen? }
 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
@@ -291,6 +297,9 @@ end
 end
 
 package %w[
+  gcc
+  g++
+  make
   ruby
   ruby-dev
   libssl-dev
@@ -305,10 +314,14 @@ gem_package "bundler" do
   version "1.17.3"
 end
 
-%w[2016 2017 2018 2019 2020].each do |year|
+gem_package "bundler" do
+  version "2.1.4"
+end
+
+%w[2016 2017 2018 2019 2020 2021].each do |year|
   git "/srv/#{year}.stateofthemap.org" do
     action :sync
-    repository "git://github.com/openstreetmap/stateofthemap-#{year}.git"
+    repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
     depth 1
     user "root"
     group "root"
@@ -316,7 +329,7 @@ end
   end
 
   directory "/srv/#{year}.stateofthemap.org/_site" do
-    mode 0o755
+    mode "755"
     owner "nobody"
     group "nogroup"
   end
@@ -324,14 +337,14 @@ end
   # Workaround https://github.com/jekyll/jekyll/issues/7804
   # by creating a .jekyll-cache folder
   directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do
-    mode 0o755
+    mode "755"
     owner "nobody"
     group "nogroup"
   end
 
   execute "/srv/#{year}.stateofthemap.org/Gemfile" do
     action :nothing
-    command "bundle install --deployment"
+    command "bundle install --deployment --jobs #{node[:cpu][:total]}"
     cwd "/srv/#{year}.stateofthemap.org"
     user "root"
     group "root"
@@ -345,6 +358,7 @@ end
     cwd "/srv/#{year}.stateofthemap.org"
     user "nobody"
     group "nogroup"
+    environment "LANG" => "C.UTF-8"
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
@@ -363,6 +377,6 @@ template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o750
+  mode "750"
   variables :passwords => passwords
 end