X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ad3e2819b13806241579857b92b15a94239b265c..8338ca56db576db8ec53f6f6fb3907e2ca370f75:/cookbooks/foundation/recipes/owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index fb9aca201..6c637c62a 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -19,32 +19,24 @@
 
 include_recipe "apache"
 include_recipe "git"
+include_recipe "ruby"
 
-package %w[
+package %W[
   gcc
   g++
   make
-  ruby2.7
-  ruby2.7-dev
   libssl-dev
   zlib1g-dev
   pkg-config
 ]
 
-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 "https://github.com/openstreetmap/owg-website.git"
   depth 1
   user "root"
   group "root"
-  notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
+  notifies :run, "bundle_install[/srv/operations.osmfoundation.org]"
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
@@ -61,18 +53,17 @@ directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
   group "nogroup"
 end
 
-execute "/srv/operations.osmfoundation.org/Gemfile" do
+bundle_install "/srv/operations.osmfoundation.org" do
   action :nothing
-  command "bundle2.7 install --deployment"
-  cwd "/srv/operations.osmfoundation.org"
+  options "--deployment"
   user "root"
   group "root"
-  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+  notifies :run, "bundle_exec[/srv/operations.osmfoundation.org]"
 end
 
-execute "/srv/operations.osmfoundation.org" do
-  command "bundle2.7 exec jekyll build --trace"
-  cwd "/srv/operations.osmfoundation.org"
+bundle_exec "/srv/operations.osmfoundation.org" do
+  action :nothing
+  command "jekyll build --trace"
   user "nobody"
   group "nogroup"
 end