dulcy: switch to postgresql 12

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index cc093b3c9036fd2ef8a670229333663283a83c9c..b60d02bac284c6394c02391ccb9ea19c59a1de1a 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: foundation
+# Cookbook:: foundation
 # Recipe:: owg
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,18 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
-package "ruby"
-package "ruby-dev"
+package %w[
+  ruby
+  ruby-dev
+  zlib1g-dev
+]
 
-gem_package "bundler"
+gem_package "bundler" do
+  version "1.17.3"
+end
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
@@ -39,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"
+  command "bundle install --deployment"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"