Merge remote-tracking branch 'github/pull/89'

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 55eb8eb364c4dede21caf0e7a43c69c2bd885c98..0dc6e8e76ccb88b39008610113710e3bbbd16aae 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -17,24 +17,33 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
 
 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"
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "2007.stateofthemap.org" do
   aliases "2007.stateofthemap.com"
   directory "/srv/2007.stateofthemap.org/wp"
   ssl_enabled true
 end
 
 wordpress_site "2007.stateofthemap.org" do
   aliases "2007.stateofthemap.com"
   directory "/srv/2007.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2007"
   database_user "sotm2007"
   database_password passwords["sotm2007"]
   database_name "sotm2007"
   database_user "sotm2007"
   database_password passwords["sotm2007"]


@@ -59,15 +68,13 @@ end
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "2008.stateofthemap.org" do
   aliases "2008.stateofthemap.com"
   directory "/srv/2008.stateofthemap.org/wp"
   ssl_enabled true
 end
 
 wordpress_site "2008.stateofthemap.org" do
   aliases "2008.stateofthemap.com"
   directory "/srv/2008.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2008"
   database_user "sotm2008"
   database_password passwords["sotm2008"]
   database_name "sotm2008"
   database_user "sotm2008"
   database_password passwords["sotm2008"]


@@ -87,7 +94,7 @@ end
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2009.stateofthemap.org" do
 end
 
 git "/srv/2009.stateofthemap.org" do


@@ -102,8 +109,6 @@ wordpress_site "2009.stateofthemap.org" do
   aliases "2009.stateofthemap.com"
   directory "/srv/2009.stateofthemap.org/wp"
   ssl_enabled true
   aliases "2009.stateofthemap.com"
   directory "/srv/2009.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2009"
   database_user "sotm2009"
   database_password passwords["sotm2009"]
   database_name "sotm2009"
   database_user "sotm2009"
   database_password passwords["sotm2009"]


@@ -125,7 +130,7 @@ end
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2010.stateofthemap.org" do
 end
 
 git "/srv/2010.stateofthemap.org" do


@@ -140,8 +145,6 @@ wordpress_site "2010.stateofthemap.org" do
   aliases "2010.stateofthemap.com"
   directory "/srv/2010.stateofthemap.org/wp"
   ssl_enabled true
   aliases "2010.stateofthemap.com"
   directory "/srv/2010.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2010"
   database_user "sotm2010"
   database_password passwords["sotm2010"]
   database_name "sotm2010"
   database_user "sotm2010"
   database_password passwords["sotm2010"]


@@ -166,7 +169,7 @@ end
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2011.stateofthemap.org" do
 end
 
 git "/srv/2011.stateofthemap.org" do


@@ -181,8 +184,6 @@ wordpress_site "2011.stateofthemap.org" do
   aliases "2011.stateofthemap.com"
   directory "/srv/2011.stateofthemap.org/wp"
   ssl_enabled true
   aliases "2011.stateofthemap.com"
   directory "/srv/2011.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2011"
   database_user "sotm2011"
   database_password passwords["sotm2011"]
   database_name "sotm2011"
   database_user "sotm2011"
   database_password passwords["sotm2011"]


@@ -207,7 +208,7 @@ end
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2012.stateofthemap.org" do
 end
 
 git "/srv/2012.stateofthemap.org" do


@@ -222,8 +223,6 @@ wordpress_site "2012.stateofthemap.org" do
   aliases "2012.stateofthemap.com"
   directory "/srv/2012.stateofthemap.org/wp"
   ssl_enabled true
   aliases "2012.stateofthemap.com"
   directory "/srv/2012.stateofthemap.org/wp"
   ssl_enabled true

-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"

   database_name "sotm2012"
   database_user "sotm2012"
   database_password passwords["sotm2012"]
   database_name "sotm2012"
   database_user "sotm2012"
   database_password passwords["sotm2012"]


@@ -249,10 +248,44 @@ wordpress_plugin "wp-sticky" do
   site "2012.stateofthemap.org"
 end
 
   site "2012.stateofthemap.org"
 end
 

+directory "/srv/2016.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode 0o755
+end
+
+wordpress_site "2016.stateofthemap.org" do
+  aliases "2016.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"
   group "root"
 template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

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