X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/70c9fb3921e6f0c95828d52f3538cde194cc3414..9584cda7a747710c42f2d4b2bd876c4014f1ad6f:/cookbooks/foundation/recipes/owg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index a34a16f2a..7054ec14a 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,52 +17,9 @@ # limitations under the License. # -include_recipe "apache::ssl" -include_recipe "git" +include_recipe "podman::apache" -package "ruby" -package "ruby-dev" - -gem_package "bundler" - -git "/srv/operations.osmfoundation.org" do - action :sync - repository "git://github.com/openstreetmap/owg-website.git" - user "root" - group "root" - notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]" -end - -directory "/srv/operations.osmfoundation.org/_site" do - mode 0o755 - owner "nobody" - group "nogroup" -end - -execute "/srv/operations.osmfoundation.org/Gemfile" do - action :nothing - command "bundle install" - cwd "/srv/operations.osmfoundation.org" - user "root" - group "root" - notifies :run, "execute[/srv/operations.osmfoundation.org]" -end - -execute "/srv/operations.osmfoundation.org" do - action :nothing - command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org" - cwd "/srv/operations.osmfoundation.org" - user "nobody" - group "nogroup" -end - -ssl_certificate "operations.osmfoundation.org" do - domains "operations.osmfoundation.org" - fallback_certificate "osmfoundation" - notifies :reload, "service[apache2]" -end - -apache_site "operations.osmfoundation.org" do - template "apache.owg.erb" - directory "/srv/operations.osmfoundation.org/_site" +podman_site "operations.osmfoundation.org" do + image "ghcr.io/openstreetmap/owg-website:latest" + aliases ["operations.openstreetmap.org", "operations.osm.org"] end