Add new stateofthemap site for 2016

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index ec21f90a9ff74de3cefc7d2b03f1146c6e547481..fae6b442d44d74680a1d6d9d590574e917712373 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -235,6 +235,42 @@ wordpress_plugin "wp-sticky" do
   site "2012.stateofthemap.org"
 end
 
+directory "/srv/2016.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode 0755
+end
+
+wordpress_site "2016.stateofthemap.org" do
+  aliases ["2016.stateofthemap.com",
+           "www.stateofthemap.org", "stateofthemap.org",
+           "www.stateofthemap.com", "stateofthemap.com"]
+  directory "/srv/2016.stateofthemap.org/wp"
+  ssl_enabled true
+  database_name "sotm2016"
+  database_user "sotm2016"
+  database_password passwords["sotm2016"]
+end
+
+wordpress_theme "aerodrome" do
+  site "2016.stateofthemap.org"
+  repository "git://git.openstreetmap.org/stateofthemap.git"
+  revision "theme-2012"
+end
+
+wordpress_plugin "leaflet-maps-marker" do
+  site "2016.stateofthemap.org"
+end
+
+wordpress_plugin "sitepress-multilingual-cms" do
+  site "2016.stateofthemap.org"
+  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+end
+
+wordpress_plugin "wp-sticky" do
+  site "2016.stateofthemap.org"
+end
+
 template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"

diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index 86795a810041b5162ef79b057e257acaff24a8c4..30937d2cb8f23fb9ad6efcb6d688d31932172be6 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -8,7 +8,7 @@ B=sotm-$D.tar.gz
 
 mkdir $T/sotm-$D
 
-<% 2007.upto(2012) do |year| -%>
+<% %w(2007 2008 2009 2010 2011 2012 2016).each do |year| -%>
 mysqldump --user=sotm<%= year %> --password=<%= @passwords["sotm#{year}"] %> --opt sotm<%= year %> > $T/sotm-$D/sotm<%= year %>.sql
 <% end -%>
 
@@ -18,6 +18,7 @@ ln -s /srv/2009.stateofthemap.org $T/sotm-$D/www2009
 ln -s /srv/2010.stateofthemap.org $T/sotm-$D/www2010
 ln -s /srv/2011.stateofthemap.org $T/sotm-$D/www2011
 ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
+ln -s /srv/2016.stateofthemap.org $T/sotm-$D/www2016
 
 export GZIP="--rsyncable -9"
 export RSYNC_RSH="ssh -ax -c arcfour"