Disable mod_perl

[deb/packages.git] / conf / apache.conf.sed.in

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5f5dea41c125010985ff49e66978255efb0355b9..ec90f962f8660f74d50b5f7c90300d136dc154b8 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -83,35 +83,48 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
-   PerlModule Apache::Registry
-   PerlTaintCheck On
+#   PerlModule ModPerl::Registry
+#   PerlTaintCheck On
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
    <Location /cgi-bin/>
-      SetHandler perl-script
-      PerlRequire %TOPDIR%/bin/mod_perl-startup
-      PerlInitHandler Apache::Reload
-      PerlHandler Apache::Registry
+#      SetHandler perl-script
+      # mod-perl etch
+#      PerlInitHandler Apache2::Reload
+      # mod-perl sarge
+      #PerlInitHandler Apache::Reload
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>
 
+   BrowserMatch reportbug is_reportbug
+
    RewriteEngine on
    RewriteLog /var/log/apache2/rewrite.log
    RewriteLogLevel 0
 
+   RewriteRule ^/cgi-bin/search_packages.pl(.*)$ /search$1
+   RewriteRule ^/cgi-bin/search_contents.pl(.*)$ /search$1
+   RewriteRule ^/unstable/newpkg_([a-z]+)\.[a-z]+\.rdf /unstable/$1/newpkg?format=rss [R=permanent,L]
+   RewriteRule ^/unstable/newpkg_([a-z]+) /unstable/$1/newpkg [R=permanent,L]
+
    # we never want to rewrite those URLs
-   RewriteRule ^/cgi-(bin|old)/ - [L]
+   RewriteRule ^/cgi-bin/dispatcher.pl - [L]
    RewriteRule ^/changelogs/ - [L]
    RewriteRule ^/Pics/ - [L]
+   RewriteRule ^/about/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
+   RewriteRule ^/[^/]+\.js - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
+   RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
    RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
 
-   RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [PT]
+   RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
 
 #  In case we need to disable the site again
 #