The following commit has been merged in the archive-master branch:
commit e7d9fe1a703567bfc758eeab9591f906efafe611
Merge: 6620aa54bd038b88b9ed6a383c8b905769320356
9f59a972d18eab0966908bbdcd8a4a5e14c899d4
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Jun 8 12:04:48 2008 +0200
Merge branch 'master' into archive-master
diff --combined conf/apache.conf.sed.in
index d5f19a1,2067d86..aa68eaa
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -8,7 -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
@@@ -69,21 -72,21 +69,21 @@@
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
+# 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>
@@@ -108,13 -111,17 +108,17 @@@
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]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
