X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..74ce2698c86c5b50d044c1dbd110c9132318bcd6:/cookbooks/foundation/recipes/owg.rb diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb index 0e8f2b722..60878e22c 100644 --- a/cookbooks/foundation/recipes/owg.rb +++ b/cookbooks/foundation/recipes/owg.rb @@ -18,53 +18,24 @@ # include_recipe "apache" -include_recipe "git" +include_recipe "podman" -package %w[ - ruby - ruby-dev - zlib1g-dev -] +docker_external_port = 8091 -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" +podman_service "operations.osmfoundation.org" do + description "Container service for operations.osmfoundation.org" + image "ghcr.io/openstreetmap/owg-website:latest" + ports docker_external_port => "8080" end ssl_certificate "operations.osmfoundation.org" do - domains "operations.osmfoundation.org" + domains ["operations.osmfoundation.org", "operations.openstreetmap.org", "operations.osm.org"] notifies :reload, "service[apache2]" end +apache_module "proxy_http" + apache_site "operations.osmfoundation.org" do template "apache.owg.erb" - directory "/srv/operations.osmfoundation.org/_site" + variables :docker_external_port => docker_external_port, :aliases => ["operations.openstreetmap.org", "operations.osm.org"] end