Replace intelmas with sst

[chef.git] / cookbooks / foundation / recipes / owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 31d41aa1fdd85c491b6594fe0f2a2ae6fe09a27c..6c637c62aa684eddc97ca014092dcebd4127c546 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -19,29 +19,24 @@
 
 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"

+include_recipe "ruby"

 
 

-package %w[
+package %W[

   gcc
   g++
   make
   gcc
   g++
   make

-  ruby
-  ruby-dev

   libssl-dev
   zlib1g-dev
   pkg-config
 ]
 
   libssl-dev
   zlib1g-dev
   pkg-config
 ]
 

-gem_package "bundler" do
-  version "1.17.3"
-end
-

 git "/srv/operations.osmfoundation.org" do
   action :sync
   repository "https://github.com/openstreetmap/owg-website.git"
   depth 1
   user "root"
   group "root"
 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
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do


@@ -58,18 +53,17 @@ directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

-execute "/srv/operations.osmfoundation.org/Gemfile" do
+bundle_install "/srv/operations.osmfoundation.org" do

   action :nothing
   action :nothing

-  command "bundle install --deployment"
-  cwd "/srv/operations.osmfoundation.org"
+  options "--deployment"

   user "root"
   group "root"
   user "root"
   group "root"

-  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+  notifies :run, "bundle_exec[/srv/operations.osmfoundation.org]"

 end
 
 end
 

-execute "/srv/operations.osmfoundation.org" do
-  command "bundle 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
   user "nobody"
   group "nogroup"
 end