Default to using the upstream repository for postgres

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index b3bd0430c4a56e3a846fc1650c7a317f9e1b2a58..78965844826e7838bc510d5368c0259a48cf5bed 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: blog
+# Cookbook:: blog

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["osmfoundation"]
-

 include_recipe "wordpress"
 
 passwords = data_bag_item("blog", "passwords")
 include_recipe "wordpress"
 
 passwords = data_bag_item("blog", "passwords")


@@ -26,48 +24,51 @@ passwords = data_bag_item("blog", "passwords")
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "blog.openstreetmap.org" do
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
 end
 
 wordpress_site "blog.openstreetmap.org" do
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "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",
   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
 
 end
 

-wordpress_theme "osmblog-wp-theme" do
+wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
+  theme "osmblog-wp-theme"

   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
   site "blog.openstreetmap.org"
   repository "git://github.com/harry-wood/osmblog-wp-theme.git"
 end
 

-wordpress_plugin "google-analytics-for-wordpress" do
+wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
+  plugin "google-analytics-for-wordpress"

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

-wordpress_plugin "google-sitemap-generator" do
+wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
+  plugin "google-sitemap-generator"

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

-wordpress_plugin "shareadraft" do
+wordpress_plugin "blog.openstreetmap.org-shareadraft" do
+  plugin "shareadraft"

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

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
+  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
 
 end
 

-wordpress_plugin "wordpress-importer" do
+wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
+  plugin "wordpress-importer"

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


@@ -87,6 +88,19 @@ git "/srv/blog.openstreetmap.org/images" do
   group "wordpress"
 end
 
   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
+
+ssl_certificate "opengeodata.org" do
+  domains ["opengeodata.org", "www.opengeodata.org", "old.opengeodata.org"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"
 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"


@@ -96,6 +110,6 @@ template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end