X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0fcf341478df2184e3e78a29d093aa6017911251..ef2dc1a9326fcbc6b676cdbc7dde07eebe6c0f73:/cookbooks/trac/recipes/default.rb diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb index 4f5526002..953efeaef 100644 --- a/cookbooks/trac/recipes/default.rb +++ b/cookbooks/trac/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: trac +# Cookbook:: trac # Recipe:: default # -# Copyright 2012, OpenStreetMap Foundation +# Copyright:: 2012, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,82 +18,24 @@ # include_recipe "apache" +include_recipe "podman" -package %w[ - trac - trac-git - ruby -] +docker_external_port = 8094 -site_name = "trac.openstreetmap.org" -site_directory = "/srv/#{site_name}" - -template "/var/lib/trac/conf/trac.ini" do - source "trac.ini.erb" - owner "trac" - group "www-data" - mode 0o644 - variables :name => site_name -end - -remote_directory "/var/lib/trac/htdocs" do - source "htdocs" - owner "trac" - group "trac" - mode 0o755 - files_owner "trac" - files_group "trac" - files_mode 0o644 - purge true -end - -remote_directory "/var/lib/trac/templates" do - source "templates" - owner "trac" - group "trac" - mode 0o755 - files_owner "trac" - files_group "trac" - files_mode 0o644 - purge true -end - -execute "trac-deploy-#{site_name}" do - command "trac-admin /var/lib/trac deploy #{site_directory}" - user "root" - group "root" - not_if { File.exist?(site_directory) } +podman_service "trac.openstreetmap.org" do + description "Container service for trac.openstreetmap.org" + image "ghcr.io/openstreetmap/trac-website:latest" + ports docker_external_port => "8080" end -cookbook_file "/usr/local/bin/trac-authenticate" do - owner "root" - group "root" - mode 0o755 -end - -apache_module "wsgi" - ssl_certificate "trac.openstreetmap.org" do domains ["trac.openstreetmap.org", "trac.osm.org"] notifies :reload, "service[apache2]" end -apache_site site_name do - template "apache.erb" - directory site_directory - variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"] -end +apache_module "proxy_http" -template "/etc/sudoers.d/trac" do - source "sudoers.erb" - owner "root" - group "root" - mode 0o440 -end - -template "/etc/cron.daily/trac-backup" do - source "backup.cron.erb" - owner "root" - group "root" - mode 0o755 +apache_site "trac.openstreetmap.org" do + template "apache.erb" + variables :docker_external_port => docker_external_port, :aliases => ["trac.osm.org"] end