X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/82218c8e9c12e6feef3a476dc37c923a97b61681..bdd6d4fbb325191ae5d0a836460949b7a10908a1:/cookbooks/foundation/recipes/owg.rb diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index ec441deda..31d41aa1f 100644 --- a/cookbooks/foundation/recipes/owg.rb +++ b/cookbooks/foundation/recipes/owg.rb @@ -21,32 +21,46 @@ include_recipe "apache" include_recipe "git" package %w[ + gcc + g++ + make ruby ruby-dev + libssl-dev zlib1g-dev + pkg-config ] -gem_package 'bundler' do +gem_package "bundler" do version "1.17.3" 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 "bundle install --deployment" cwd "/srv/operations.osmfoundation.org" user "root" group "root" @@ -54,8 +68,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 "bundle exec jekyll build --trace" cwd "/srv/operations.osmfoundation.org" user "nobody" group "nogroup"