Merge remote-tracking branch 'github/pull/578'

[chef.git] / cookbooks / switch2osm / recipes / default.rb

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index c0a3da3cbf87aa9165c268e93b7b0c876f9a6a84..78ca5ea6b9cef5294325b82ebf1d94cd1ab90813 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -18,64 +18,14 @@
 #
 
 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 = 8093

 
 

-apache_module "expires"
-apache_module "rewrite"
-
-gem_package "bundler" do
-  version "1.17.3"
-end
-
-git "/srv/switch2osm.org" do
-  action :sync
-  repository "https://github.com/switch2osm/switch2osm.github.io.git"
-  depth 1
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/switch2osm.org/Gemfile]"
-end
-
-directory "/srv/switch2osm.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/switch2osm.org/.jekyll-cache" do
-  mode "755"
-  owner "nobody"
-  group "nogroup"
-end
-
-execute "/srv/switch2osm.org/Gemfile" do
-  action :nothing
-  command "bundle install --deployment"
-  cwd "/srv/switch2osm.org"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/switch2osm.org]"
-end
-
-execute "/srv/switch2osm.org" do
-  action :nothing
-  command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"
-  cwd "/srv/switch2osm.org"
-  user "nobody"
-  group "nogroup"
+podman_service "switch2osm.org" do
+  description "Container service for switch2osm.org"
+  image "ghcr.io/switch2osm/switch2osm:latest"
+  ports docker_external_port => "8080"

 end
 
 ssl_certificate "switch2osm.org" do
 end
 
 ssl_certificate "switch2osm.org" do


@@ -84,7 +34,9 @@ ssl_certificate "switch2osm.org" do
   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end
 

+apache_module "proxy_http"
+

 apache_site "switch2osm.org" do
   template "apache.erb"
 apache_site "switch2osm.org" do
   template "apache.erb"

-  directory "/srv/switch2osm.org/_site"
+  variables :docker_external_port => docker_external_port, :aliases => ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]

 end
 end