X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=8e8e2cc883e079edaa7bfdb71fab57e26bd39345;hb=acce36b93fc8530fb50f50ca9edd08e6f6409b04;hp=2b6913b8aa267e5a61dc1f8456637b6bb47acddb;hpb=da0b1ee79860ccd17033f11da212178d51ce9f47;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 2b6913b..8e8e2cc 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -22,49 +22,34 @@
   AddLanguage bg .bg
   AddLanguage ca .ca
   AddLanguage cs .cs
-  AddCharset ISO-8859-2 .cs
   AddLanguage da .da
-  AddCharset ISO-8859-1 .da
   AddLanguage de .de
   AddLanguage el .el
   AddLanguage eo .eo
   AddLanguage es .es
-  AddCharset ISO-8859-1 .es
   AddLanguage fi .fi
-  AddCharset ISO-8859-1 .fi
   AddLanguage fr .fr
   AddLanguage hr .hr
   AddLanguage hu .hu
-  AddCharset ISO-8859-2 .hu
   AddLanguage id .id
   AddLanguage it .it
-  AddCharset ISO-8859-1 .it
   AddLanguage ja .ja
-  AddCharset EUC_JP .ja
   AddLanguage ko .ko
   AddLanguage lt .lt
   AddLanguage nl .nl
-  AddCharset ISO-8859-1 .nl
   AddLanguage no .no
   AddLanguage nb .nb
   AddLanguage pl .pl
-  AddCharset ISO-8859-2 .pl
   AddLanguage pt .pt
-  AddCharset ISO-8859-1 .pt
   AddLanguage pt-pt .pt_PT
-  AddCharset ISO-8859-1 .pt_PT
   AddLanguage pt-br .pt_BR
-  AddCharset ISO-8859-1 .pt_BR
   AddLanguage ro .ro
   AddLanguage ru .ru
   AddLanguage sk .sk
-  AddCharset ISO-8859-2 .sk
   AddLanguage sl .sl
   AddLanguage sv .sv_SE
-  AddCharset ISO-8859-1 .sv_SE
   AddLanguage tr .tr
   AddLanguage uk .uk
-  AddCharset KOI8-U .uk
   AddLanguage zh-CN .zh-cn
   AddLanguage zh-HK .zh-hk
   AddLanguage zh-TW .zh-tw
@@ -74,26 +59,30 @@
 
   # 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
+   PerlSwitches -T
    <Location /cgi-bin/>
       SetHandler perl-script
       # mod-perl etch
-      #PerlInitHandler Apache2::Reload
+      PerlInitHandler Apache2::Reload
       # mod-perl sarge
-      PerlInitHandler Apache::Reload
+      #PerlInitHandler Apache::Reload
       PerlHandler ModPerl::Registry
       Options +ExecCGI
       PerlSendHeader On
@@ -118,6 +107,7 @@
    RewriteRule ^/changelogs/ - [L]
    RewriteRule ^/Pics/ - [L]
    RewriteRule ^/about/ - [L]
+   RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
 
@@ -126,6 +116,13 @@
    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
+   RewriteRule . - [L]
 
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
 
@@ -138,3 +135,17 @@
 #   RewriteRule . /index.html
 
 </VirtualHost>
+
+#<VirtualHost *>
+#   ServerAdmin frank@lichtenheld.de
+#   DocumentRoot %TOPDIR%/www/
+#   ServerName packages.ubuntu.net
+#   ServerAlias packages.ubuntulinux.org
+#   ErrorLog /var/log/apache2/%SITE%-error.log
+#   CustomLog /var/log/apache2/%SITE%-access.log combined
+#
+#   ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
+#
+#   RedirectMatch permanent (.*) http://%SITE%$1
+#</VirtualHost>
+