X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8517d5da18ea743e5c932fd90b8a0324ab50f3d0..230dce809a029bf156e18b84693de422e16fee80:/cookbooks/foundation/recipes/owg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index b60d02bac..fb9aca201 100644 --- a/cookbooks/foundation/recipes/owg.rb +++ b/cookbooks/foundation/recipes/owg.rb @@ -21,25 +21,34 @@ 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" 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 - 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 @@ -47,14 +56,14 @@ 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 + mode "755" owner "nobody" group "nogroup" end execute "/srv/operations.osmfoundation.org/Gemfile" do action :nothing - command "bundle install --deployment" + command "bundle2.7 install --deployment" cwd "/srv/operations.osmfoundation.org" user "root" group "root" @@ -62,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"