X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cdb2f6f01940242c613b6c1d31332598dec7d625..5524a5f2a12c63acc122269b928cf28a4b0ce211:/cookbooks/stateofthemap/recipes/default.rb

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index fae6b442d..0dc6e8e76 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -21,10 +21,23 @@ 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"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "2007.stateofthemap.org" do
@@ -55,7 +68,7 @@ end
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 wordpress_site "2008.stateofthemap.org" do
@@ -81,7 +94,7 @@ end
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2009.stateofthemap.org" do
@@ -117,7 +130,7 @@ end
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2010.stateofthemap.org" do
@@ -156,7 +169,7 @@ end
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2011.stateofthemap.org" do
@@ -195,7 +208,7 @@ end
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2012.stateofthemap.org" do
@@ -238,13 +251,11 @@ end
 directory "/srv/2016.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 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"
@@ -275,6 +286,6 @@ template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end