Add certificate for opengeodata.org

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 41970b977b6abdda2b1c7a2aa47dfd092221862f..83f022ee3b7c8fcd3a9aa1fe7fc4055378715ed0 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -24,13 +24,13 @@ 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
 end
 
 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"
   ssl_enabled true
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"


@@ -38,7 +38,7 @@ wordpress_site "blog.openstreetmap.org" do
   database_password passwords["osm-blog-user"]
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
   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
 end
 
 wordpress_theme "osmblog-wp-theme" do


@@ -83,6 +83,18 @@ 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"


@@ -92,6 +104,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