Add test for stateofthemap cookbook

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 4521d668ea4817ffcb9e9a454b6b058948017de3..1bb8176f177f05141a31d051821c282a68a93b29 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: stateofthemap
+# Cookbook:: stateofthemap

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -270,7 +270,7 @@ end
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
   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
 
     notifies :reload, "service[apache2]"
   end
 


@@ -281,15 +281,28 @@ end
   end
 end
 
   end
 end
 

-gem_package "jekyll"
+package %w[
+  ruby
+  ruby-dev
+  libssl-dev
+  zlib1g-dev
+  pkg-config
+]

 
 

-%w[2016 2017 2018].each do |year|
+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"
     user "root"
     group "root"
   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]"
+    notifies :run, "execute[/srv/#{year}.stateofthemap.org/Gemfile]"

   end
 
   directory "/srv/#{year}.stateofthemap.org/_site" do
   end
 
   directory "/srv/#{year}.stateofthemap.org/_site" do


@@ -298,16 +311,34 @@ gem_package "jekyll"
     group "nogroup"
   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
   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
     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
 
     notifies :reload, "service[apache2]"
   end