X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a9d3eeee531641b13f1932b602eb63ea390c41e..80d6d380c0a01ed6e5f8f06225c2d3e3eb14f172:/cookbooks/stateofthemap/recipes/jekyll.rb

diff --git a/cookbooks/stateofthemap/recipes/jekyll.rb b/cookbooks/stateofthemap/recipes/jekyll.rb
index 5a55092dc..c4e008016 100644
--- a/cookbooks/stateofthemap/recipes/jekyll.rb
+++ b/cookbooks/stateofthemap/recipes/jekyll.rb
@@ -17,66 +17,18 @@
 # limitations under the License.
 #
 
-include_recipe "stateofthemap"
-include_recipe "ruby"
+include_recipe "apache"
+include_recipe "podman"
 
-package %w[
-  gcc
-  g++
-  make
-  libssl-dev
-  zlib1g-dev
-  pkg-config
-]
-
-apache_module "expires"
-apache_module "rewrite"
+apache_module "proxy_http"
 
 %w[2016 2017 2018 2019 2020 2021 2022].each do |year|
-  git "/srv/#{year}.stateofthemap.org" do
-    action :sync
-    repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
-    depth 1
-    user "root"
-    group "root"
-    notifies :run, "bundle_install[/srv/#{year}.stateofthemap.org]"
-  end
-
-  directory "/srv/#{year}.stateofthemap.org/_site" do
-    mode "755"
-    owner "nobody"
-    group "nogroup"
-  end
-
-  # FIXME: fix the the vendor directory permissions from prior root installs
-  directory "/srv/#{year}.stateofthemap.org/vendor" do
-    action :create
-    recursive true
-    owner "nobody"
-    group "nogroup"
-  end
-
-  bundle_install "/srv/#{year}.stateofthemap.org" do
-    action :nothing
-    user "nobody"
-    group "nogroup"
-    environment "BUNDLE_FROZEN" => "true",
-                "BUNDLE_WITHOUT" => "development:test",
-                "BUNDLE_PATH" => "vendor/bundle",
-                "BUNDLE_DEPLOYMENT" => "1",
-                "BUNDLE_JOBS" => node.cpu_cores.to_s
-    notifies :run, "bundle_exec[/srv/#{year}.stateofthemap.org]"
-    only_if { ::File.exist?("/srv/#{year}.stateofthemap.org/Gemfile") }
-  end
+  docker_external_port = 6080 + year.to_i # 8096+
 
-  bundle_exec "/srv/#{year}.stateofthemap.org" do
-    action :nothing
-    command "jekyll build --trace --disable-disk-cache --baseurl=https://#{year}.stateofthemap.org"
-    user "nobody"
-    group "nogroup"
-    environment "LANG" => "C.UTF-8",
-                "BUNDLE_PATH" => "vendor/bundle",
-                "BUNDLE_DEPLOYMENT" => "1"
+  podman_service "#{year}.stateofthemap.org" do
+    description "Container service for #{year}.stateofthemap.org"
+    image "ghcr.io/openstreetmap/stateofthemap-#{year}:latest"
+    ports docker_external_port => "8080"
   end
 
   ssl_certificate "#{year}.stateofthemap.org" do
@@ -86,7 +38,6 @@ apache_module "rewrite"
 
   apache_site "#{year}.stateofthemap.org" do
     template "apache.jekyll.erb"
-    directory "/srv/#{year}.stateofthemap.org/_site"
-    variables :year => year
+    variables :docker_external_port => docker_external_port, :aliases => ["#{year}.stateofthemap.com", "#{year}.sotm.org"]
   end
 end