Merge branch 'master' 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 a3a074e97396cc24f33bb15825b284ebfb71c763..dfbefed44657fbca13783be2a0a191ad8c3d9d6b 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -9,8 +9,9 @@
   # Nice caching..
   ExpiresActive On
   ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif "access plus 1 week"
-  ExpiresByType image/jpeg "access plus 1 week"
+  ExpiresByType image/gif  "modification plus 1 year"
+  ExpiresByType image/jpeg "modification plus 1 year"
+  ExpiresByType image/png  "modification plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -73,19 +74,19 @@
 
    ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
-#   PerlModule ModPerl::Registry
-#   PerlTaintCheck On
-#   PerlRequire %TOPDIR%/bin/mod_perl-startup
-#   PerlSwitches -T
+   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
+      PerlHandler ModPerl::Registry
       Options +ExecCGI
-#      PerlSendHeader On
+      PerlSendHeader On
       allow from all
    </Location>
 
@@ -110,13 +111,18 @@
    RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
+   RewriteRule ^/favicon.ico$ - [L]
+   RewriteRule ^/robots.txt$ - [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]
+   RewriteRule ^/$                     /index.html [L]
+   RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
+   RewriteRule ^/changelog:(.+)$       http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
+   RewriteRule ^/src:([^/]+)$          http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+   RewriteRule ^/file:(.+)$            http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+   RewriteCond %{REQUEST_URI} !^/search$ [OR]
+   RewriteCond %{QUERY_STRING} ^$
+   RewriteRule ^/([^/]+)$              http://%SITE%/search?keywords=$1 [R,L,NE]
 
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
@@ -135,3 +141,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>
+