apache.conf: Some more URIs need to be handled dynamically

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

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index c9c302226d38896f384931e11dbcb5b816cbb9d9..e6cc7f6e0a2c8068c2b947e88b7d7ae80e02d854 100644 (file)
--- 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,6 +59,9 @@
 
   # RSS stuff
   AddType application/rss+xml .rdf .xml
+
+  RemoveType .gz
+  AddEncoding x-gzip .gz
 </Directory>
 
 <VirtualHost *>
@@ -129,6 +117,12 @@
    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]
 
 #  In case we need to disable the site again