Use operations.osmfoundation.org container

[chef.git] / cookbooks / foundation / recipes / owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index dc1f359eb749457fd30acb4332cf66a71be727a8..60878e22c55c987f74deee2d80da0042c738b94d 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -18,69 +18,24 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

-include_recipe "git"
+include_recipe "podman"

 
 

-package %w[
-  gcc
-  g++
-  make
-  ruby
-  ruby-dev
-  libssl-dev
-  zlib1g-dev
-  pkg-config
-]
+docker_external_port = 8091

 
 

-gem_package "bundler" do
-  version "1.17.3"
-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 0o755
-  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 0o755
-  owner "nobody"
-  group "nogroup"
-end
-
-execute "/srv/operations.osmfoundation.org/Gemfile" do
-  action :nothing
-  command "bundle 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
-  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
 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
 
   notifies :reload, "service[apache2]"
 end
 

+apache_module "proxy_http"
+

 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
 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
 end