Merge remote-tracking branch 'github/pull/546'

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index e13ca7f3250a82e972acf0d210cfa7175232d77a..46b6902ad57f5db1d5320c381670998dbe7a2ff9 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -44,10 +44,11 @@ end
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
   theme "osmblog-wp-theme"
   site "blog.openstreetmap.org"
-  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
+  action :delete
   plugin "google-analytics-for-wordpress"
   site "blog.openstreetmap.org"
 end
@@ -58,24 +59,32 @@ wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
   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-www-xml-sitemap-generator-org" do
+#   plugin "www-xml-sitemap-generator-org"
+#   site "blog.openstreetmap.org"
+# end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do
+  action :delete
   plugin "shareadraft"
   site "blog.openstreetmap.org"
 end
 
+wordpress_plugin "blog.openstreetmap.org-public-post-preview" do
+  plugin "public-post-preview"
+  site "blog.openstreetmap.org"
+end
+
 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"
+  revision "master"
   not_if { kitchen? }
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
+  action :delete
   plugin "wordpress-importer"
   site "blog.openstreetmap.org"
 end