From: Grant Slater <git@firefishy.com>
Date: Sun, 13 Oct 2019 21:47:49 +0000 (+0100)
Subject: Workaround jekyll-cache issue
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/8517d5da18ea743e5c932fd90b8a0324ab50f3d0?hp=418848d98ef1254285289a7a78724b89d790d76e;ds=sidebyside

Workaround jekyll-cache issue
---

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 251999d53..b60d02bac 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -44,9 +44,17 @@ directory "/srv/operations.osmfoundation.org/_site" do
   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 0o755
+  owner "nobody"
+  group "nogroup"
+end
+
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
-  command "bundle install --deployment --jobs 4 --retry 3"
+  command "bundle install --deployment"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index ce258b10a..c9eb827d5 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -306,9 +306,17 @@ end
     group "nogroup"
   end
 
+  # Workaround https://github.com/jekyll/jekyll/issues/7804
+  # by creating a .jekyll-cache folder
+  directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do
+    mode 0o755
+    owner "nobody"
+    group "nogroup"
+  end
+
   execute "/srv/#{year}.stateofthemap.org/Gemfile" do
     action :nothing
-    command "bundle install --deployment --jobs 4 --retry 3"
+    command "bundle install --deployment"
     cwd "/srv/#{year}.stateofthemap.org"
     user "root"
     group "root"