X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7aa2626554a97e197a2b452d0234aa8ab4aaeb41..e847b156af79e857466b8ca0f51d68ef69a6dd01:/cookbooks/blogs/recipes/default.rb

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 5af8f53a5..a3c8eebee 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -20,20 +20,15 @@
 include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
+include_recipe "ruby"
 
-package %w[
-  ruby
-  ruby-dev
+package %W[
   make
   gcc
   g++
   libsqlite3-dev
 ]
 
-gem_package "bundler" do
-  version "~> 2.1.4"
-end
-
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"
@@ -46,22 +41,20 @@ git "/srv/blogs.openstreetmap.org" do
   depth 1
   user "blogs"
   group "blogs"
-  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately
+  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately
 end
 
-execute "/srv/blogs.openstreetmap.org/Gemfile" do
+bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
-  command "bundle install --deployment"
-  cwd "/srv/blogs.openstreetmap.org"
-  user "blogs"
-  group "blogs"
-  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately
+  options "--deployment"
+  user "root"
+  group "root"
+  notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
 end
 
-execute "/srv/blogs.openstreetmap.org" do
+bundle_exec "/srv/blogs.openstreetmap.org" do
   action :nothing
-  command "bundle exec pluto build -t osm -o build"
-  cwd "/srv/blogs.openstreetmap.org"
+  command "pluto build -t osm -o build"
   user "blogs"
   group "blogs"
 end