X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=conf%2Fapache.conf.sed.in;h=9c7430c0b3cc639cc6a8969246a14353be902f95;hb=9786e970292c154845a5f5dbc3086191ea59a6f0;hp=ec90f962f8660f74d50b5f7c90300d136dc154b8;hpb=21338701a5fac70f9c03646dfb44942eeba4e276;p=deb%2Fpackages.git
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index ec90f96..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
@@ -22,49 +23,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,10 +60,13 @@
# RSS stuff
AddType application/rss+xml .rdf .xml
+
+ RemoveType .gz
+ AddEncoding x-gzip .gz
- ServerAdmin webmaster@debian.org
+ ServerAdmin frank@lichtenheld.de
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
ErrorLog /var/log/apache2/%SITE%-error.log
@@ -85,18 +74,16 @@
ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
-# PerlModule ModPerl::Registry
-# PerlTaintCheck On
-# PerlRequire %TOPDIR%/bin/mod_perl-startup
+ PerlModule ModPerl::Registry
+ PerlTaintCheck On
+ PerlRequire %TOPDIR%/bin/mod_perl-startup
+ PerlSwitches -T
-# 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
@@ -106,6 +93,8 @@
RewriteLog /var/log/apache2/rewrite.log
RewriteLogLevel 0
+ RewriteMap changelog-url txt:%TOPDIR%/files/changelogs-map
+
RewriteRule ^/cgi-bin/search_packages.pl(.*)$ /search$1
RewriteRule ^/cgi-bin/search_contents.pl(.*)$ /search$1
RewriteRule ^/unstable/newpkg_([a-z]+)\.[a-z]+\.rdf /unstable/$1/newpkg?format=rss [R=permanent,L]
@@ -116,13 +105,28 @@
RewriteRule ^/changelogs/ - [L]
RewriteRule ^/Pics/ - [L]
RewriteRule ^/about/ - [L]
+ 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 ^/src:([^/]+)$ /source/$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]
+ 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]
@@ -135,3 +139,17 @@
# RewriteRule . /index.html
+
+
+ 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
+
+