X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ad3e2819b13806241579857b92b15a94239b265c..2f6ccf0818238f6048ba9ffb97dd3c343c6ca9bf:/cookbooks/foundation/recipes/owg.rb diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index fb9aca201..7054ec14a 100644 --- a/cookbooks/foundation/recipes/owg.rb +++ b/cookbooks/foundation/recipes/owg.rb @@ -17,72 +17,9 @@ # limitations under the License. # -include_recipe "apache" -include_recipe "git" +include_recipe "podman::apache" -package %w[ - gcc - g++ - make - ruby2.7 - ruby2.7-dev - libssl-dev - zlib1g-dev - pkg-config -] - -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 "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 "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 "bundle2.7 install --deployment" - cwd "/srv/operations.osmfoundation.org" - user "root" - group "root" - notifies :run, "execute[/srv/operations.osmfoundation.org]" -end - -execute "/srv/operations.osmfoundation.org" do - command "bundle2.7 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" +podman_site "operations.osmfoundation.org" do + image "ghcr.io/openstreetmap/owg-website:latest" + aliases ["operations.openstreetmap.org", "operations.osm.org"] end