Set base URL for operations site

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index ee68631359cc7ed39f67bb802b1c9e59c1db2fb6..3f4b6e3b2689b1738b420cd3035d4b2d89c9184c 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -23,14 +23,14 @@ include_recipe "git"
 package "ruby"
 package "ruby-dev"
 
 package "ruby"
 package "ruby-dev"
 

-gem_package "jekyll"
+gem_package "bundler"

 
 git "/srv/operations.osmfoundation.org" do
   action :sync
   repository "git://github.com/gravitystorm/owg-log.git"
   user "root"
   group "root"
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
   repository "git://github.com/gravitystorm/owg-log.git"
   user "root"
   group "root"

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

 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do


@@ -39,9 +39,18 @@ directory "/srv/operations.osmfoundation.org/_site" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

+execute "/srv/operations.osmfoundation.org/Gemfile" do
+  action :nothing
+  command "bundle install"
+  cwd "/srv/operations.osmfoundation.org"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+end
+

 execute "/srv/operations.osmfoundation.org" do
   action :nothing
 execute "/srv/operations.osmfoundation.org" do
   action :nothing

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

   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"