Switch katla to use postgresql.org packages

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 02479580b02ee5fd481576366037b25acfc6eb7b..e9440d75c89311bcd7b39ae18bdd2f7bedefd306 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
-
 include_recipe "wordpress"
 
 passwords = data_bag_item("blog", "passwords")
@@ -34,15 +32,13 @@ wordpress_site "blog.openstreetmap.org" do
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
   ssl_enabled true
-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"
   database_password passwords["osm-blog-user"]
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
-       "/news" => "/srv/blog.openstreetmap.org/news"
+       "/static" => "/srv/blog.openstreetmap.org/static"
 end
 
 wordpress_theme "osmblog-wp-theme" do
@@ -87,6 +83,14 @@ git "/srv/blog.openstreetmap.org/images" do
   group "wordpress"
 end
 
+git "/srv/blog.openstreetmap.org/static" do
+  action :sync
+  repository "git://github.com/openstreetmap/opengeodata-static.git"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"