Add exporter for StatusCake

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index b60d02bac284c6394c02391ccb9ea19c59a1de1a..6c637c62aa684eddc97ca014092dcebd4127c546 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -19,27 +19,28 @@
 
 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"

+include_recipe "ruby"

 
 

-package %w[
-  ruby
-  ruby-dev
+package %W[
+  gcc
+  g++
+  make
+  libssl-dev

   zlib1g-dev
   zlib1g-dev

+  pkg-config

 ]
 
 ]
 

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

 git "/srv/operations.osmfoundation.org" do
   action :sync
 git "/srv/operations.osmfoundation.org" do
   action :sync

-  repository "git://github.com/openstreetmap/owg-website.git"
+  repository "https://github.com/openstreetmap/owg-website.git"
+  depth 1

   user "root"
   group "root"
   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

-  mode 0o755
+  mode "755"

   owner "nobody"
   group "nogroup"
 end
   owner "nobody"
   group "nogroup"
 end


@@ -47,24 +48,22 @@ end
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
 # 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
 
   owner "nobody"
   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
+bundle_exec "/srv/operations.osmfoundation.org" do

   action :nothing
   action :nothing

-  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"
-  cwd "/srv/operations.osmfoundation.org"
+  command "jekyll build --trace"

   user "nobody"
   group "nogroup"
 end
   user "nobody"
   group "nogroup"
 end