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

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 54ecdca4f837cc29b37005c540d010761ac6e508..4099810f1d89a2da9904c9dc7e4e8efbcfb70c15 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -17,28 +17,9 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "podman::apache"
 
-apache_module "rewrite"
-
-directory "/srv/trac.openstreetmap.org" do
-  owner "root"
-  group "root"
-  mode "0755"
-end
-
-cookbook_file "/srv/trac.openstreetmap.org/tickets.map" do
-  owner "root"
-  group "root"
-  mode "0644"
-end
-
-ssl_certificate "trac.openstreetmap.org" do
-  domains ["trac.openstreetmap.org", "trac.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-apache_site "trac.openstreetmap.org" do
-  template "apache.erb"
-  variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"]
+podman_site "trac.openstreetmap.org" do
+  image "ghcr.io/openstreetmap/trac-website:latest"
+  aliases ["trac.osm.org"]
 end