Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index d65d75aadfd905e3d18092a68c396f7bb5646082..31d41aa1fdd85c491b6594fe0f2a2ae6fe09a27c 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -21,9 +21,14 @@ include_recipe "apache"
 include_recipe "git"
 
 package %w[
 include_recipe "git"
 
 package %w[

+  gcc
+  g++
+  make

   ruby
   ruby-dev
   ruby
   ruby-dev

+  libssl-dev

   zlib1g-dev
   zlib1g-dev

+  pkg-config

 ]
 
 gem_package "bundler" do
 ]
 
 gem_package "bundler" do


@@ -40,7 +45,7 @@ git "/srv/operations.osmfoundation.org" do
 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


@@ -48,7 +53,7 @@ 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


@@ -63,8 +68,7 @@ execute "/srv/operations.osmfoundation.org/Gemfile" do
 end
 
 execute "/srv/operations.osmfoundation.org" do
 end
 
 execute "/srv/operations.osmfoundation.org" do

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

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