X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/59daf18915ef13f46b1e7246e54edf2d78172342..2853b414b3706db2890068f45a91b170058168cd:/cookbooks/switch2osm/recipes/default.rb

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 6f3d03933..a2345be08 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -19,13 +19,12 @@
 
 include_recipe "apache"
 include_recipe "git"
+include_recipe "ruby"
 
 package %w[
   gcc
   g++
   make
-  ruby
-  ruby-dev
   libssl-dev
   zlib1g-dev
   pkg-config
@@ -34,21 +33,17 @@ package %w[
 apache_module "expires"
 apache_module "rewrite"
 
-gem_package "bundler" do
-  version "1.17.3"
-end
-
 git "/srv/switch2osm.org" do
   action :sync
   repository "https://github.com/switch2osm/switch2osm.github.io.git"
   depth 1
   user "root"
   group "root"
-  notifies :run, "execute[/srv/switch2osm.org/Gemfile]"
+  notifies :run, "bundle_install[/srv/switch2osm.org]"
 end
 
 directory "/srv/switch2osm.org/_site" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
@@ -56,24 +51,22 @@ end
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/switch2osm.org/.jekyll-cache" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
 
-execute "/srv/switch2osm.org/Gemfile" do
+bundle_install "/srv/switch2osm.org" do
   action :nothing
-  command "bundle install --deployment"
-  cwd "/srv/switch2osm.org"
+  options "--deployment"
   user "root"
   group "root"
-  notifies :run, "execute[/srv/switch2osm.org]"
+  notifies :run, "bundle_exec[/srv/switch2osm.org]"
 end
 
-execute "/srv/switch2osm.org" do
+bundle_exec "/srv/switch2osm.org" do
   action :nothing
-  command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"
-  cwd "/srv/switch2osm.org"
+  command "jekyll build --trace --config _config.yml,_config_osm.yml"
   user "nobody"
   group "nogroup"
 end