X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..a19f9c4c8ce5cbc8b5b73d2d33de98bae686176b:/cookbooks/foundation/recipes/owg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index 64f7cd5de..fb9aca201 100644 --- a/cookbooks/foundation/recipes/owg.rb +++ b/cookbooks/foundation/recipes/owg.rb @@ -1,8 +1,8 @@ # -# 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. @@ -21,29 +21,49 @@ include_recipe "apache" include_recipe "git" package %w[ - ruby - ruby-dev + gcc + g++ + make + ruby2.7 + ruby2.7-dev + libssl-dev + zlib1g-dev + pkg-config ] -gem_package "bundler" +gem_package "bundler" do + package_name "bundler" + version "~> 2.2.22" + gem_binary "gem2.7" + options "--format-executable" +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 - 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 - command "bundle install" + command "bundle2.7 install --deployment" cwd "/srv/operations.osmfoundation.org" user "root" group "root" @@ -51,8 +71,7 @@ execute "/srv/operations.osmfoundation.org/Gemfile" 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"