X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=9c7430c0b3cc639cc6a8969246a14353be902f95;hb=9786e970292c154845a5f5dbc3086191ea59a6f0;hp=b69afe2da48ca0b900f38e7b4db5919ec1f4fcf4;hpb=4c6c02445d6bd955db66d82946b8c955b1f43615;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index b69afe2..9c7430c 100644
--- 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,16 @@
 
    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
-      # mod-perl etch
-#      PerlInitHandler Apache2::Reload
-      # mod-perl sarge
-      #PerlInitHandler Apache::Reload
-#      PerlHandler ModPerl::Registry
+      SetHandler perl-script
+      PerlInitHandler Apache2::Reload
+      PerlHandler ModPerl::Registry
       Options +ExecCGI
-#      PerlSendHeader On
+      PerlSendHeader On
       allow from all
    </Location>
 
@@ -110,13 +108,19 @@
    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:(.+)$	/changelogs/${changelog-url:$1} [R,L,NE]
+   RewriteRule ^/src:([^/]+)$		/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+   RewriteRule ^/file:(.+)$		/search?searchon=contents&keywords=$1 [R,L,NE]
+   RewriteCond %{QUERY_STRING} ^$ [OR]
+   RewriteCond %{REQUEST_URI} !^/search$
+   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+   RewriteRule ^/([^/]+)$		/search?keywords=$1 [R,L,NE]
 
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
@@ -136,16 +140,16 @@
 
 </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>
+<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>