X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0a374fa9435ff5f1f21874f99d2c460f6f7d8c2a..63d5334f6d273133e119f17399cd316113f8e48b:/cookbooks/foundation/recipes/owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index bc9b27093..fb9aca201 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: foundation
+# Cookbook:: foundation
 # Recipe:: owg
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,30 +21,49 @@ include_recipe "apache"
 include_recipe "git"
 
 package %w[
-  ruby
-  ruby-dev
+  gcc
+  g++
+  make
+  ruby2.7
+  ruby2.7-dev
+  libssl-dev
   zlib1g-dev
+  pkg-config
 ]
 
-gem_package "bundler"
+gem_package "bundler" do
+  package_name "bundler"
+  version "~> 2.2.22"
+  gem_binary "gem2.7"
+  options "--format-executable"
+end
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
-  repository "git://github.com/openstreetmap/owg-website.git"
+  repository "https://github.com/openstreetmap/owg-website.git"
+  depth 1
   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
-  mode 0o755
+  mode "755"
+  owner "nobody"
+  group "nogroup"
+end
+
+# Workaround https://github.com/jekyll/jekyll/issues/7804
+# by creating a .jekyll-cache folder
+directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
 
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
-  command "bundle install"
+  command "bundle2.7 install --deployment"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
@@ -52,8 +71,7 @@ execute "/srv/operations.osmfoundation.org/Gemfile" do
 end
 
 execute "/srv/operations.osmfoundation.org" do
-  action :nothing
-  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"
+  command "bundle2.7 exec jekyll build --trace"
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"