Nginx: drop spdy + log/keepalive tweaks + cleanups

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index fae6b442d44d74680a1d6d9d590574e917712373..55e40e217c799af9805d2187e0c838967ec07bda 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -21,6 +21,19 @@ include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
 
+git "/srv/stateofthemap.org" do
+  action :sync
+  repository "git://git.openstreetmap.org/stateofthemap.git"
+  revision "chooser"
+  user "root"
+  group "root"
+end
+
+apache_site "stateofthemap.org" do
+  template "apache.erb"
+  directory "/srv/stateofthemap.org"
+end
+
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
@@ -242,9 +255,7 @@ directory "/srv/2016.stateofthemap.org" do
 end
 
 wordpress_site "2016.stateofthemap.org" do
-  aliases ["2016.stateofthemap.com",
-           "www.stateofthemap.org", "stateofthemap.org",
-           "www.stateofthemap.com", "stateofthemap.com"]
+  aliases "2016.stateofthemap.com"
   directory "/srv/2016.stateofthemap.org/wp"
   ssl_enabled true
   database_name "sotm2016"