Enable promscale

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 251999d53358098bb00cc6b4d320a240170e9a13..fb9aca201a4a6135ebe33952ad2805e9484844df 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -21,32 +21,49 @@ include_recipe "apache"
 include_recipe "git"
 
 package %w[
 include_recipe "git"
 
 package %w[

-  ruby
-  ruby-dev
+  gcc
+  g++
+  make
+  ruby2.7
+  ruby2.7-dev
+  libssl-dev

   zlib1g-dev
   zlib1g-dev

+  pkg-config

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

-  version "1.17.3"
+  package_name "bundler"
+  version "~> 2.2.22"
+  gem_binary "gem2.7"
+  options "--format-executable"

 end
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
 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]"
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
 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
   action :nothing
   owner "nobody"
   group "nogroup"
 end
 
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing

-  command "bundle install --deployment --jobs 4 --retry 3"
+  command "bundle2.7 install --deployment"

   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"


@@ -54,8 +71,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 "bundle2.7 exec jekyll build --trace"

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