X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/92fe4a42d003e40c2d7218de7aedbd8128969178..14918532e78d6ef901011b382a83645d4e3e9638:/cookbooks/stateofthemap/recipes/default.rb?ds=inline diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb index 13803a3e9..76efd9a44 100644 --- a/cookbooks/stateofthemap/recipes/default.rb +++ b/cookbooks/stateofthemap/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: stateofthemap +# Cookbook:: stateofthemap # Recipe:: default # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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, @@ -23,8 +23,9 @@ passwords = data_bag_item("stateofthemap", "passwords") git "/srv/stateofthemap.org" do action :sync - repository "git://git.openstreetmap.org/stateofthemap.git" + repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "chooser" + depth 1 user "root" group "root" end @@ -50,7 +51,6 @@ 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"] @@ -58,14 +58,14 @@ wordpress_site "2007.stateofthemap.org" do end wordpress_theme "2007.stateofthemap.org-refreshwp-11" do - name "refreshwp-11" + theme "refreshwp-11" 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 - name "geopress" + plugin "geopress" site "2007.stateofthemap.org" end @@ -78,7 +78,6 @@ 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"] @@ -86,14 +85,14 @@ wordpress_site "2008.stateofthemap.org" do end wordpress_theme "2008.stateofthemap.org-refreshwp-11" do - name "refreshwp-11" + theme "refreshwp-11" 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 - name "geopress" + plugin "geopress" site "2008.stateofthemap.org" end @@ -105,8 +104,9 @@ end 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" + depth 1 user "wordpress" group "wordpress" end @@ -114,7 +114,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"] @@ -124,14 +123,14 @@ wordpress_site "2009.stateofthemap.org" do end wordpress_theme "2009.stateofthemap.org-aerodrome" do - name "aerodrome" + theme "aerodrome" 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 - name "wp-sticky" + plugin "wp-sticky" site "2009.stateofthemap.org" end @@ -143,8 +142,9 @@ end 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" + depth 1 user "wordpress" group "wordpress" end @@ -152,7 +152,6 @@ 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"] @@ -160,20 +159,21 @@ wordpress_site "2010.stateofthemap.org" do end wordpress_theme "2010.stateofthemap.org-aerodrome" do - name "aerodrome" + theme "aerodrome" 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 - name "sitepress-multilingual-cms" + plugin "sitepress-multilingual-cms" site "2010.stateofthemap.org" - repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git" + repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git" + not_if { ENV["TEST_KITCHEN"] } end wordpress_plugin "2010.stateofthemap.org-wp-sticky" do - name "wp-sticky" + plugin "wp-sticky" site "2010.stateofthemap.org" end @@ -185,8 +185,9 @@ end 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" + depth 1 user "wordpress" group "wordpress" end @@ -194,7 +195,6 @@ 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"] @@ -202,20 +202,21 @@ wordpress_site "2011.stateofthemap.org" do end wordpress_theme "2011.stateofthemap.org-aerodrome" do - name "aerodrome" + theme "aerodrome" 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 - name "sitepress-multilingual-cms" + plugin "sitepress-multilingual-cms" site "2011.stateofthemap.org" - repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git" + repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git" + not_if { ENV["TEST_KITCHEN"] } end wordpress_plugin "2011.stateofthemap.org-wp-sticky" do - name "wp-sticky" + plugin "wp-sticky" site "2011.stateofthemap.org" end @@ -227,8 +228,9 @@ end 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" + depth 1 user "wordpress" group "wordpress" end @@ -236,7 +238,6 @@ 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"] @@ -244,39 +245,41 @@ wordpress_site "2012.stateofthemap.org" do end wordpress_theme "2012.stateofthemap.org-aerodrome" do - name "aerodrome" + theme "aerodrome" 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 - name "leaflet-maps-marker" + plugin "leaflet-maps-marker" 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" - repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git" + repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git" + not_if { ENV["TEST_KITCHEN"] } end wordpress_plugin "2012.stateofthemap.org-wp-sticky" do - name "wp-sticky" + plugin "wp-sticky" site "2012.stateofthemap.org" end %w[2013].each do |year| git "/srv/#{year}.stateofthemap.org" do action :sync - repository "git://git.openstreetmap.org/stateofthemap.git" + repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "site-#{year}" + depth 1 user "root" group "root" end ssl_certificate "#{year}.stateofthemap.org" do - domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com"] + domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"] notifies :reload, "service[apache2]" end @@ -287,13 +290,29 @@ end end end -%w[2016 2017 2018].each do |year| +package %w[ + ruby + ruby-dev + libssl-dev + zlib1g-dev + pkg-config +] + +apache_module "expires" +apache_module "rewrite" + +gem_package "bundler" do + version "1.17.3" +end + +%w[2016 2017 2018 2019 2020].each do |year| git "/srv/#{year}.stateofthemap.org" do action :sync - repository "git://github.com/openstreetmap/stateofthemap-#{year}.git" + repository "https://github.com/openstreetmap/stateofthemap-#{year}.git" + depth 1 user "root" group "root" - notifies :run, "execute[/srv/#{year}.stateofthemap.org]" + notifies :run, "execute[/srv/#{year}.stateofthemap.org/Gemfile]" end directory "/srv/#{year}.stateofthemap.org/_site" do @@ -302,16 +321,34 @@ end group "nogroup" end + # Workaround https://github.com/jekyll/jekyll/issues/7804 + # by creating a .jekyll-cache folder + directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do + mode 0o755 + owner "nobody" + group "nogroup" + end + + execute "/srv/#{year}.stateofthemap.org/Gemfile" do + action :nothing + command "bundle install --deployment" + cwd "/srv/#{year}.stateofthemap.org" + user "root" + group "root" + notifies :run, "execute[/srv/#{year}.stateofthemap.org]" + only_if { ::File.exist?("/srv/#{year}.stateofthemap.org/Gemfile") } + end + execute "/srv/#{year}.stateofthemap.org" do action :nothing - command "jekyll build --trace" + command "bundle exec jekyll build --trace --baseurl=https://#{year}.stateofthemap.org" cwd "/srv/#{year}.stateofthemap.org" user "nobody" group "nogroup" end ssl_certificate "#{year}.stateofthemap.org" do - domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com"] + domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"] notifies :reload, "service[apache2]" end