Cleaner redirect using 404 handler for demised sites

diff --git a/cookbooks/subversion/templates/default/apache.erb b/cookbooks/subversion/templates/default/apache.erb
index 188051eeaee502cb1feaeebe57088685acbbada3..49c1e1eba94a9b66f0aabce894ad0d109dec74fb 100644 (file)
--- a/cookbooks/subversion/templates/default/apache.erb
+++ b/cookbooks/subversion/templates/default/apache.erb
@@ -12,8 +12,6 @@
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent /applications/editors/josm/plugins/cadastre-fr/images/cadastre_small.png https://raw.githubusercontent.com/openstreetmap/svn-archive/main/applications/editors/josm/plugins/cadastre-fr/images/cadastre_small.png
-  RedirectPermanent / https://github.com/openstreetmap/svn-archive
-
   ErrorDocument 404 https://github.com/openstreetmap/svn-archive
 
 </VirtualHost>

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index 199be20d6db99a18271e4a137221a3416575ccb1..f8f898e2a3888a4dacd3f426613d363badbd7c74 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -48,5 +48,5 @@
   RewriteMap tickets txt:/srv/trac.openstreetmap.org/tickets.map
   RewriteRule ^/ticket/(\d+)$ https://github.com/openstreetmap/trac-tickets/issues/${tickets:$1}
 
-  RedirectPermanent / https://github.com/openstreetmap/trac-tickets
+  ErrorDocument 404 https://github.com/openstreetmap/trac-tickets
 </VirtualHost>