Merge branch 'debian-refactor' into ubuntu-master

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

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index ec90f962f8660f74d50b5f7c90300d136dc154b8..6384605b1666e4f3102a20c4ee5aa4b28f3bdb14 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -77,7 +77,7 @@
 </Directory>
 
 <VirtualHost *>
-   ServerAdmin webmaster@debian.org
+   ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
    ErrorLog /var/log/apache2/%SITE%-error.log
@@ -106,6 +106,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,12 +118,14 @@
    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 ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]