X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=49d88faef1c74f91e1108aab90defebee52b77ff;hb=6a99f4714326a371636fae11a2613160a32d8c8f;hp=8594aecc7c41d1429c629055fada41c060631b89;hpb=6f5fa1dbee1bf3a6dba1fb1aa0f6575c0c10352e;p=deb%2Fpackages.git

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8594aec..49d88fa 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -8,10 +8,7 @@
 
   # Nice caching..
   ExpiresActive On
-  ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif  "modification plus 1 year"
-  ExpiresByType image/jpeg "modification plus 1 year"
-  ExpiresByType image/png  "modification plus 1 year"
+  ExpiresDefault "access plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -72,18 +69,18 @@
    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
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
    PerlSwitches -T
    <Location /cgi-bin/>
-      SetHandler perl-script
-      PerlInitHandler Apache2::Reload
-      PerlHandler ModPerl::Registry
+#      SetHandler perl-script
+#      PerlInitHandler Apache2::Reload
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>
 
@@ -111,21 +108,23 @@
    RewriteRule ^/robots.txt$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$			/index.html [L]
+   RewriteRule ^/$			/index [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 %{REQUEST_URI} !^/search$ [OR]
-   RewriteCond %{QUERY_STRING} ^$
-   RewriteRule ^/([^/]+)$		/search?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]
 
+   RewriteCond %{QUERY_STRING} ^$ [OR]
+   RewriteCond %{REQUEST_URI} !^/search$
+   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+   RewriteRule ^/([^/]+)$		/search?keywords=$1 [R,L,NE]
+
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
 
 #  In case we need to disable the site again