Don't disable loopback connection tracking on 14.04

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index f0936381ff53463ace6046c2a7bb4a12082909b9..4521d668ea4817ffcb9e9a454b6b058948017de3 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -23,7 +23,7 @@ passwords = data_bag_item("stateofthemap", "passwords")
 
 git "/srv/stateofthemap.org" do
   action :sync
 
 git "/srv/stateofthemap.org" do
   action :sync

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "chooser"
   user "root"
   group "root"
   revision "chooser"
   user "root"
   group "root"


@@ -50,7 +50,6 @@ end
 wordpress_site "2007.stateofthemap.org" do
   aliases "2007.stateofthemap.com"
   directory "/srv/2007.stateofthemap.org/wp"
 wordpress_site "2007.stateofthemap.org" do
   aliases "2007.stateofthemap.com"
   directory "/srv/2007.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -58,14 +57,14 @@ wordpress_site "2007.stateofthemap.org" do
 end
 
 wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
 end
 
 wordpress_theme "2007.stateofthemap.org-refreshwp-11" do

-  name "refreshwp-11"
+  theme "refreshwp-11"

   site "2007.stateofthemap.org"
   site "2007.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2007"
 end
 
 wordpress_plugin "2007.stateofthemap.org-geopress" do
   revision "theme-2007"
 end
 
 wordpress_plugin "2007.stateofthemap.org-geopress" do

-  name "geopress"
+  plugin "geopress"

   site "2007.stateofthemap.org"
 end
 
   site "2007.stateofthemap.org"
 end
 


@@ -78,7 +77,6 @@ end
 wordpress_site "2008.stateofthemap.org" do
   aliases "2008.stateofthemap.com"
   directory "/srv/2008.stateofthemap.org/wp"
 wordpress_site "2008.stateofthemap.org" do
   aliases "2008.stateofthemap.com"
   directory "/srv/2008.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -86,14 +84,14 @@ wordpress_site "2008.stateofthemap.org" do
 end
 
 wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
 end
 
 wordpress_theme "2008.stateofthemap.org-refreshwp-11" do

-  name "refreshwp-11"
+  theme "refreshwp-11"

   site "2008.stateofthemap.org"
   site "2008.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2008"
 end
 
 wordpress_plugin "2008.stateofthemap.org-geopress" do
   revision "theme-2008"
 end
 
 wordpress_plugin "2008.stateofthemap.org-geopress" do

-  name "geopress"
+  plugin "geopress"

   site "2008.stateofthemap.org"
 end
 
   site "2008.stateofthemap.org"
 end
 


@@ -105,7 +103,7 @@ end
 
 git "/srv/2009.stateofthemap.org" do
   action :sync
 
 git "/srv/2009.stateofthemap.org" do
   action :sync

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "resources-2009"
   user "wordpress"
   group "wordpress"
   revision "resources-2009"
   user "wordpress"
   group "wordpress"


@@ -114,7 +112,6 @@ end
 wordpress_site "2009.stateofthemap.org" do
   aliases "2009.stateofthemap.com"
   directory "/srv/2009.stateofthemap.org/wp"
 wordpress_site "2009.stateofthemap.org" do
   aliases "2009.stateofthemap.com"
   directory "/srv/2009.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -124,14 +121,14 @@ wordpress_site "2009.stateofthemap.org" do
 end
 
 wordpress_theme "2009.stateofthemap.org-aerodrome" do
 end
 
 wordpress_theme "2009.stateofthemap.org-aerodrome" do

-  name "aerodrome"
+  theme "aerodrome"

   site "2009.stateofthemap.org"
   site "2009.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2009"
 end
 
 wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
   revision "theme-2009"
 end
 
 wordpress_plugin "2009.stateofthemap.org-wp-sticky" do

-  name "wp-sticky"
+  plugin "wp-sticky"

   site "2009.stateofthemap.org"
 end
 
   site "2009.stateofthemap.org"
 end
 


@@ -143,7 +140,7 @@ end
 
 git "/srv/2010.stateofthemap.org" do
   action :sync
 
 git "/srv/2010.stateofthemap.org" do
   action :sync

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "resources-2010"
   user "wordpress"
   group "wordpress"
   revision "resources-2010"
   user "wordpress"
   group "wordpress"


@@ -152,7 +149,6 @@ end
 wordpress_site "2010.stateofthemap.org" do
   aliases "2010.stateofthemap.com"
   directory "/srv/2010.stateofthemap.org/wp"
 wordpress_site "2010.stateofthemap.org" do
   aliases "2010.stateofthemap.com"
   directory "/srv/2010.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -160,20 +156,20 @@ wordpress_site "2010.stateofthemap.org" do
 end
 
 wordpress_theme "2010.stateofthemap.org-aerodrome" do
 end
 
 wordpress_theme "2010.stateofthemap.org-aerodrome" do

-  name "aerodrome"
+  theme "aerodrome"

   site "2010.stateofthemap.org"
   site "2010.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2010"
 end
 
 wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
   revision "theme-2010"
 end
 
 wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do

-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"

   site "2010.stateofthemap.org"
   site "2010.stateofthemap.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

 end
 
 wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
 end
 
 wordpress_plugin "2010.stateofthemap.org-wp-sticky" do

-  name "wp-sticky"
+  plugin "wp-sticky"

   site "2010.stateofthemap.org"
 end
 
   site "2010.stateofthemap.org"
 end
 


@@ -185,7 +181,7 @@ end
 
 git "/srv/2011.stateofthemap.org" do
   action :sync
 
 git "/srv/2011.stateofthemap.org" do
   action :sync

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "resources-2011"
   user "wordpress"
   group "wordpress"
   revision "resources-2011"
   user "wordpress"
   group "wordpress"


@@ -194,7 +190,6 @@ end
 wordpress_site "2011.stateofthemap.org" do
   aliases "2011.stateofthemap.com"
   directory "/srv/2011.stateofthemap.org/wp"
 wordpress_site "2011.stateofthemap.org" do
   aliases "2011.stateofthemap.com"
   directory "/srv/2011.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -202,20 +197,20 @@ wordpress_site "2011.stateofthemap.org" do
 end
 
 wordpress_theme "2011.stateofthemap.org-aerodrome" do
 end
 
 wordpress_theme "2011.stateofthemap.org-aerodrome" do

-  name "aerodrome"
+  theme "aerodrome"

   site "2011.stateofthemap.org"
   site "2011.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2011"
 end
 
 wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
   revision "theme-2011"
 end
 
 wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do

-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"

   site "2011.stateofthemap.org"
   site "2011.stateofthemap.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

 end
 
 wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
 end
 
 wordpress_plugin "2011.stateofthemap.org-wp-sticky" do

-  name "wp-sticky"
+  plugin "wp-sticky"

   site "2011.stateofthemap.org"
 end
 
   site "2011.stateofthemap.org"
 end
 


@@ -227,7 +222,7 @@ end
 
 git "/srv/2012.stateofthemap.org" do
   action :sync
 
 git "/srv/2012.stateofthemap.org" do
   action :sync

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "resources-2012"
   user "wordpress"
   group "wordpress"
   revision "resources-2012"
   user "wordpress"
   group "wordpress"


@@ -236,7 +231,6 @@ end
 wordpress_site "2012.stateofthemap.org" do
   aliases "2012.stateofthemap.com"
   directory "/srv/2012.stateofthemap.org/wp"
 wordpress_site "2012.stateofthemap.org" do
   aliases "2012.stateofthemap.com"
   directory "/srv/2012.stateofthemap.org/wp"

-  ssl_enabled true

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


@@ -244,28 +238,51 @@ wordpress_site "2012.stateofthemap.org" do
 end
 
 wordpress_theme "2012.stateofthemap.org-aerodrome" do
 end
 
 wordpress_theme "2012.stateofthemap.org-aerodrome" do

-  name "aerodrome"
+  theme "aerodrome"

   site "2012.stateofthemap.org"
   site "2012.stateofthemap.org"

-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"

   revision "theme-2012"
 end
 
 wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
   revision "theme-2012"
 end
 
 wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do

-  name "leaflet-maps-marker"
+  plugin "leaflet-maps-marker"

   site "2012.stateofthemap.org"
 end
 
 wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
   site "2012.stateofthemap.org"
 end
 
 wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do

-  name "sitepress-multilingual-cms"
+  plugin "sitepress-multilingual-cms"

   site "2012.stateofthemap.org"
   site "2012.stateofthemap.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"

 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do

-  name "wp-sticky"
+  plugin "wp-sticky"

   site "2012.stateofthemap.org"
 end
 
   site "2012.stateofthemap.org"
 end
 

+%w[2013].each do |year|
+  git "/srv/#{year}.stateofthemap.org" do
+    action :sync
+    repository "https://git.openstreetmap.org/public/stateofthemap.git"
+    revision "site-#{year}"
+    user "root"
+    group "root"
+  end
+
+  ssl_certificate "#{year}.stateofthemap.org" do
+    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com"]
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site "#{year}.stateofthemap.org" do
+    template "apache.static.erb"
+    directory "/srv/#{year}.stateofthemap.org"
+    variables :year => year
+  end
+end
+
+gem_package "jekyll"
+

 %w[2016 2017 2018].each do |year|
   git "/srv/#{year}.stateofthemap.org" do
     action :sync
 %w[2016 2017 2018].each do |year|
   git "/srv/#{year}.stateofthemap.org" do
     action :sync