X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..366f2c3039f3115f856906fc19cc1fbae348fffc:/cookbooks/switch2osm/recipes/default.rb diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb index a2345be08..d4eb9eeec 100644 --- a/cookbooks/switch2osm/recipes/default.rb +++ b/cookbooks/switch2osm/recipes/default.rb @@ -17,67 +17,9 @@ # limitations under the License. # -include_recipe "apache" -include_recipe "git" -include_recipe "ruby" +include_recipe "podman::apache" -package %w[ - gcc - g++ - make - libssl-dev - zlib1g-dev - pkg-config -] - -apache_module "expires" -apache_module "rewrite" - -git "/srv/switch2osm.org" do - action :sync - repository "https://github.com/switch2osm/switch2osm.github.io.git" - depth 1 - user "root" - group "root" - notifies :run, "bundle_install[/srv/switch2osm.org]" -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 - -bundle_install "/srv/switch2osm.org" do - action :nothing - options "--deployment" - user "root" - group "root" - notifies :run, "bundle_exec[/srv/switch2osm.org]" -end - -bundle_exec "/srv/switch2osm.org" do - action :nothing - command "jekyll build --trace --config _config.yml,_config_osm.yml" - user "nobody" - group "nogroup" -end - -ssl_certificate "switch2osm.org" do - domains ["switch2osm.org", - "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"] - notifies :reload, "service[apache2]" -end - -apache_site "switch2osm.org" do - template "apache.erb" - directory "/srv/switch2osm.org/_site" +podman_site "switch2osm.org" do + image "ghcr.io/switch2osm/switch2osm:latest" + aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"] end