X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e4a0595002f1f428a98776070ad4677b6433b46f..a19f9c4c8ce5cbc8b5b73d2d33de98bae686176b:/cookbooks/foundation/recipes/owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index d65d75aad..fb9aca201 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -21,13 +21,21 @@ 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" do
-  version "1.17.3"
+  package_name "bundler"
+  version "~> 2.2.22"
+  gem_binary "gem2.7"
+  options "--format-executable"
 end
 
 git "/srv/operations.osmfoundation.org" do
@@ -40,7 +48,7 @@ git "/srv/operations.osmfoundation.org" do
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
@@ -48,14 +56,14 @@ end
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
 
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
-  command "bundle install --deployment"
+  command "bundle2.7 install --deployment"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
@@ -63,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"