Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...

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

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 36032d7b2c9be8fe45ff4e2f60ce49ea4c03ad8c..bbb24d943fef27941504174d673a0248bba05ee7 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -74,29 +74,33 @@
 
   # RSS stuff
   AddType application/rss+xml .rdf .xml
+
+  RemoveType .gz
+  AddEncoding x-gzip .gz
 </Directory>
 
 <VirtualHost *>
-   ServerAdmin webmaster@debian.org
+   ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
    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 ModPerl::Registry
-   PerlTaintCheck On
-   PerlRequire %TOPDIR%/bin/mod_perl-startup
+#   PerlModule ModPerl::Registry
+#   PerlTaintCheck On
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
+#   PerlSwitches -T
    <Location /cgi-bin/>
-      SetHandler perl-script
+#      SetHandler perl-script
       # mod-perl etch
-      #PerlInitHandler Apache2::Reload
+#      PerlInitHandler Apache2::Reload
       # mod-perl sarge
-      PerlInitHandler Apache::Reload
-      PerlHandler ModPerl::Registry
+      #PerlInitHandler Apache::Reload
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>
 
@@ -106,6 +110,8 @@
    RewriteLog /var/log/apache2/rewrite.log
    RewriteLogLevel 0
 
+   RewriteMap changelog-url txt:%TOPDIR%/files/changelogs-map
+
    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]
@@ -116,13 +122,23 @@
    RewriteRule ^/changelogs/ - [L]
    RewriteRule ^/Pics/ - [L]
    RewriteRule ^/about/ - [L]
+   RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
    RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+   RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
+   RewriteRule ^/file:(.+)$ http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+
+   RewriteCond %{QUERY_STRING} =""
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l [OR]
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -d
+   RewriteRule . - [L]
 
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]