X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/70b83d4da0417ee395fb5e30730f9738fbb4724a..a9bcfed7afd3f7cf5a39b6ce44b2b9bda03b3b53:/cookbooks/stateofthemap/recipes/default.rb diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb index 0d55936e0..3d2348da6 100644 --- a/cookbooks/stateofthemap/recipes/default.rb +++ b/cookbooks/stateofthemap/recipes/default.rb @@ -173,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 @@ -217,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 @@ -266,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 @@ -344,7 +344,7 @@ 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" @@ -358,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