Add remote hands account to tetaneutral machines

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index f8ec4f05ad0ae66b8f11951fee0f1da4efcd12e8..8827bdbd301d0327e600473c025634ccd3125bdd 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -31,7 +31,6 @@ wordpress_site "blog.openstreetmap.org" do
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]

-  ssl_enabled true

   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"


@@ -42,34 +41,34 @@ wordpress_site "blog.openstreetmap.org" do
 end
 
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
 end
 
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do

-  name "osmblog-wp-theme"
+  theme "osmblog-wp-theme"

   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do

-  name "google-analytics-for-wordpress"
+  plugin "google-analytics-for-wordpress"

   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do

-  name "google-sitemap-generator"
+  plugin "google-sitemap-generator"

   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-shareadraft" do

-  name "shareadraft"
+  plugin "shareadraft"

   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   site "blog.openstreetmap.org"
 end
 
 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do

-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"

   site "blog.openstreetmap.org"
   site "blog.openstreetmap.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do

-  name "wordpress-importer"
+  plugin "wordpress-importer"

   site "blog.openstreetmap.org"
 end
 
   site "blog.openstreetmap.org"
 end