X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/36f59a4bf269a7c9ed41df253cd76f4b9199c59a..bdd6d4fbb325191ae5d0a836460949b7a10908a1:/cookbooks/foundation/recipes/owg.rb?ds=inline diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index bb707aa53..31d41aa1f 100644 --- 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,31 +17,50 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "git" -package "ruby" -package "ruby-dev" +package %w[ + gcc + g++ + make + ruby + ruby-dev + libssl-dev + zlib1g-dev + pkg-config +] -gem_package "bundler" +gem_package "bundler" do + version "1.17.3" +end git "/srv/operations.osmfoundation.org" do action :sync - repository "git://github.com/gravitystorm/owg-log.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" @@ -49,13 +68,17 @@ execute "/srv/operations.osmfoundation.org/Gemfile" do end execute "/srv/operations.osmfoundation.org" do - action :nothing command "bundle exec jekyll build --trace" cwd "/srv/operations.osmfoundation.org" user "nobody" group "nogroup" end +ssl_certificate "operations.osmfoundation.org" do + domains "operations.osmfoundation.org" + notifies :reload, "service[apache2]" +end + apache_site "operations.osmfoundation.org" do template "apache.owg.erb" directory "/srv/operations.osmfoundation.org/_site"