Disable installation of geporess wordpress plugin

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 39d537eea561e65205499c407a7a1dd5bf6585a9..447628c9fe63ee426cb2d552c9754da2c18af2c3 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -65,10 +65,10 @@ wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
   revision "theme-2007"
 end
 
   revision "theme-2007"
 end
 

-wordpress_plugin "2007.stateofthemap.org-geopress" do
-  plugin "geopress"
-  site "2007.stateofthemap.org"
-end
+# wordpress_plugin "2007.stateofthemap.org-geopress" do
+#   plugin "geopress"
+#   site "2007.stateofthemap.org"
+# end

 
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
 
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"


@@ -93,10 +93,10 @@ wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
   revision "theme-2008"
 end
 
   revision "theme-2008"
 end
 

-wordpress_plugin "2008.stateofthemap.org-geopress" do
-  plugin "geopress"
-  site "2008.stateofthemap.org"
-end
+# wordpress_plugin "2008.stateofthemap.org-geopress" do
+#   plugin "geopress"
+#   site "2008.stateofthemap.org"
+# end

 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"


@@ -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"
   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
 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"
   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
 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"
   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
 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do


@@ -318,7 +318,7 @@ gem_package "bundler" do
   version "2.1.4"
 end
 
   version "2.1.4"
 end
 

-%w[2016 2017 2018 2019 2020].each do |year|
+%w[2016 2017 2018 2019 2020 2021 2022].each do |year|

   git "/srv/#{year}.stateofthemap.org" do
     action :sync
     repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
   git "/srv/#{year}.stateofthemap.org" do
     action :sync
     repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"


@@ -344,7 +344,7 @@ end
 
   execute "/srv/#{year}.stateofthemap.org/Gemfile" do
     action :nothing
 
   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"
     cwd "/srv/#{year}.stateofthemap.org"
     user "root"
     group "root"


@@ -358,6 +358,7 @@ end
     cwd "/srv/#{year}.stateofthemap.org"
     user "nobody"
     group "nogroup"
     cwd "/srv/#{year}.stateofthemap.org"
     user "nobody"
     group "nogroup"

+    environment "LANG" => "C.UTF-8"

   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do