Tighten timeouts and log request timeouts

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 953efeaef664e6223ec55060f7d76000036898c6..4099810f1d89a2da9904c9dc7e4e8efbcfb70c15 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -17,25 +17,9 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
-include_recipe "podman"
+include_recipe "podman::apache"
 
-docker_external_port = 8094
-
-podman_service "trac.openstreetmap.org" do
-  description "Container service for trac.openstreetmap.org"
+podman_site "trac.openstreetmap.org" do
   image "ghcr.io/openstreetmap/trac-website:latest"
-  ports docker_external_port => "8080"
-end
-
-ssl_certificate "trac.openstreetmap.org" do
-  domains ["trac.openstreetmap.org", "trac.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-apache_module "proxy_http"
-
-apache_site "trac.openstreetmap.org" do
-  template "apache.erb"
-  variables :docker_external_port => docker_external_port, :aliases => ["trac.osm.org"]
+  aliases ["trac.osm.org"]
 end