Fix new foodcritic warnings

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 55e40e217c799af9805d2187e0c838967ec07bda..e697ae88c223f2aa0be6c2bff670100eb91b1ab4 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
 #
-#     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,
@@ -29,6 +29,13 @@ git "/srv/stateofthemap.org" do
   group "root"
 end
 
+ssl_certificate "stateofthemap.org" do
+  domains ["stateofthemap.org", "www.stateofthemap.org",
+           "stateofthemap.com", "www.stateofthemap.com",
+           "sotm.org", "www.sotm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "stateofthemap.org" do
   template "apache.erb"
   directory "/srv/stateofthemap.org"
@@ -37,64 +44,61 @@ end
 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
   database_name "sotm2007"
   database_user "sotm2007"
   database_password passwords["sotm2007"]
   database_prefix "wp_sotm_"
 end
 
-wordpress_theme "refreshwp-11" do
+wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
+  theme "refreshwp-11"
   site "2007.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2007"
 end
 
-wordpress_plugin "geopress" do
-  site "2007.stateofthemap.org"
-end
-
-wordpress_plugin "sem-static-front" do
+wordpress_plugin "2007.stateofthemap.org-geopress" do
+  plugin "geopress"
   site "2007.stateofthemap.org"
-  repository "git://chef.openstreetmap.org/sem-static-front.git"
 end
 
 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
   database_name "sotm2008"
   database_user "sotm2008"
   database_password passwords["sotm2008"]
   database_prefix "wp_sotm08_"
 end
 
-wordpress_theme "refreshwp-11" do
+wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
+  theme "refreshwp-11"
   site "2008.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2008"
 end
 
-wordpress_plugin "geopress" do
+wordpress_plugin "2008.stateofthemap.org-geopress" do
+  plugin "geopress"
   site "2008.stateofthemap.org"
 end
 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2009.stateofthemap.org" do
@@ -108,7 +112,6 @@ end
 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"]
@@ -117,20 +120,22 @@ wordpress_site "2009.stateofthemap.org" do
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2009.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
   site "2009.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2009"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
+  plugin "wp-sticky"
   site "2009.stateofthemap.org"
 end
 
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2010.stateofthemap.org" do
@@ -144,32 +149,34 @@ end
 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"]
   urls "/register" => "/srv/2010.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2010.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
   site "2010.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2010"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
+  plugin "wp-sticky"
   site "2010.stateofthemap.org"
 end
 
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2011.stateofthemap.org" do
@@ -183,32 +190,34 @@ end
 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"]
   urls "/register" => "/srv/2011.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2011.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
   site "2011.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2011"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
+  plugin "wp-sticky"
   site "2011.stateofthemap.org"
 end
 
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/2012.stateofthemap.org" do
@@ -222,70 +231,95 @@ end
 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"]
   urls "/register" => "/srv/2012.stateofthemap.org/register"
 end
 
-wordpress_theme "aerodrome" do
+wordpress_theme "2012.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
   site "2012.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2012"
 end
 
-wordpress_plugin "leaflet-maps-marker" do
+wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
+  plugin "leaflet-maps-marker"
   site "2012.stateofthemap.org"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
+  plugin "wp-sticky"
   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"
-  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"
+%w[2013].each do |year|
+  git "/srv/#{year}.stateofthemap.org" do
+    action :sync
+    repository "git://git.openstreetmap.org/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
+
+%w[2016 2017 2018].each do |year|
+  git "/srv/#{year}.stateofthemap.org" do
+    action :sync
+    repository "git://github.com/openstreetmap/stateofthemap-#{year}.git"
+    user "root"
+    group "root"
+    notifies :run, "execute[/srv/#{year}.stateofthemap.org]"
+  end
+
+  directory "/srv/#{year}.stateofthemap.org/_site" do
+    mode 0o755
+    owner "nobody"
+    group "nogroup"
+  end
+
+  execute "/srv/#{year}.stateofthemap.org" do
+    action :nothing
+    command "jekyll build --trace"
+    cwd "/srv/#{year}.stateofthemap.org"
+    user "nobody"
+    group "nogroup"
+  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.jekyll.erb"
+    directory "/srv/#{year}.stateofthemap.org/_site"
+    variables :year => year
+  end
 end
 
 template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end