X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=conf%2Fapache.conf.sed.in;h=b69afe2da48ca0b900f38e7b4db5919ec1f4fcf4;hb=5e644dcaf7e467967a2e4e653b2a1d771eb7d595;hp=037f284b1d5bfd95187557112aa0fb2aafdd850b;hpb=411dd86a5f305fcce69912b47f84dc16914d2da1;p=deb%2Fpackages.git
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 037f284..b69afe2 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -22,49 +22,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,47 +59,72 @@
# 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
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
+# PerlModule ModPerl::Registry
+# PerlTaintCheck On
+# PerlRequire %TOPDIR%/bin/mod_perl-startup
+# PerlSwitches -T
- SetHandler perl-script
+# SetHandler perl-script
# mod-perl etch
- #PerlInitHandler Apache2::Reload
+# PerlInitHandler Apache2::Reload
# mod-perl sarge
- PerlInitHandler Apache::Reload
- PerlHandler ModPerl::Registry
+ #PerlInitHandler Apache::Reload
+# PerlHandler ModPerl::Registry
Options +ExecCGI
- PerlSendHeader On
+# PerlSendHeader On
allow from all
+ BrowserMatch reportbug is_reportbug
+
RewriteEngine on
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]
+ RewriteRule ^/unstable/newpkg_([a-z]+) /unstable/$1/newpkg [R=permanent,L]
+
# we never want to rewrite those URLs
- RewriteRule ^/cgi-(bin|old)/ - [L]
+ RewriteRule ^/cgi-bin/dispatcher.pl - [L]
RewriteRule ^/changelogs/ - [L]
RewriteRule ^/Pics/ - [L]
+ RewriteRule ^/about/ - [L]
+ RewriteRule ^/ubuntu/ - [L]
RewriteRule ^/[^/]+\.css - [L]
+ RewriteRule ^/[^/]+\.js - [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 ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [PT]
+ 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]
# In case we need to disable the site again
#
@@ -125,3 +135,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
+#
+