Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 2f80e2b13f78aa2437c9ae905650971a4c540a0e..820731a497b44dba6d9e641f1a5b17597f7fc408 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -53,10 +53,16 @@ wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
+  action :delete
   plugin "google-sitemap-generator"
   site "blog.openstreetmap.org"
 end
 
+# wordpress_plugin "blog.openstreetmap.org-www-xml-sitemap-generator-org" do
+#   plugin "www-xml-sitemap-generator-org"
+#   site "blog.openstreetmap.org"
+# end
+
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do
   plugin "shareadraft"
   site "blog.openstreetmap.org"
@@ -66,7 +72,8 @@ wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  not_if { ENV["TEST_KITCHEN"] }
+  revision "master"
+  not_if { kitchen? }
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
@@ -74,6 +81,11 @@ wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
   site "blog.openstreetmap.org"
 end
 
+wordpress_plugin "blog.openstreetmap.org-wp-piwik" do
+  plugin "wp-piwik"
+  site "blog.openstreetmap.org"
+end
+
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-podcasts.git"