Document IP ranges with comment

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 251999d53358098bb00cc6b4d320a240170e9a13..6c637c62aa684eddc97ca014092dcebd4127c546 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -19,44 +19,51 @@
 
 include_recipe "apache"
 include_recipe "git"
+include_recipe "ruby"
 
-package %w[
-  ruby
-  ruby-dev
+package %W[
+  gcc
+  g++
+  make
+  libssl-dev
   zlib1g-dev
+  pkg-config
 ]
 
-gem_package "bundler" do
-  version "1.17.3"
-end
-
 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"
-  notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
+  notifies :run, "bundle_install[/srv/operations.osmfoundation.org]"
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
-  mode 0o755
+  mode "755"
+  owner "nobody"
+  group "nogroup"
+end
+
+# Workaround https://github.com/jekyll/jekyll/issues/7804
+# by creating a .jekyll-cache folder
+directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
 
-execute "/srv/operations.osmfoundation.org/Gemfile" do
+bundle_install "/srv/operations.osmfoundation.org" do
   action :nothing
-  command "bundle install --deployment --jobs 4 --retry 3"
-  cwd "/srv/operations.osmfoundation.org"
+  options "--deployment"
   user "root"
   group "root"
-  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+  notifies :run, "bundle_exec[/srv/operations.osmfoundation.org]"
 end
 
-execute "/srv/operations.osmfoundation.org" do
+bundle_exec "/srv/operations.osmfoundation.org" do
   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