The following commit has been merged in the debian-master branch:
commit f13529a2f31d2dd523c2a5559f62c73129e3954d
Merge: 20687302e54e781d7f675f227ba6441df1be79dc
dc95de76e0fec5f24c66de1bd743c6a5333dc5c3
Author: Frank Lichtenheld <[email protected]>
Date: Tue Oct 27 22:53:33 2009 +0100
Merge commit 'alioth/master' into debian-master
Conflicts:
conf/apache.conf.sed.in
static/index.tmpl
templates/config.tmpl
diff --combined conf/apache.conf.sed.in
index fb7d0ce,91833a6..eac75bc
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,11 -65,10 +65,11 @@@
AddEncoding x-gzip .gz
</Directory>
-<VirtualHost *>
+<VirtualHost *:80>
ServerAdmin [email protected]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+ ServerAlias packages-piatti.debian.org packages-powell.debian.org
packages-rore.debian.org
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
@@@ -111,23 -110,24 +111,24 @@@
RewriteRule ^/favicon.ico$ - [L]
RewriteRule ^/robots.txt$ - [L]
-# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index [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 %{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]
+ 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
diff --combined templates/config.tmpl
index 0508f16,85c52f7..26d6e85
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,8 +6,8 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
packages_homepage = '/'
- packages_homepage_abs = 'http://packages.debian.net/'
+ packages_homepage_abs = 'http://packages.debian.org/'
+ old_releases = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -18,10 -19,10 +19,10 @@@
security_mirror = 'security.debian.org'
security_mirror_url = security_mirror _ '/debian-security'
security_suite_suffix = '/updates'
- changelogs_url = 'http://packages.debian.org/changelogs/'
+ changelogs_url = '/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
cn_help_url = project_homepage _ 'intro/cn'
- patch_tracking_url = 'http://patch-tracking.debian.net/package'
+ patch_tracking_url = 'http://patch-tracker.debian.org/package'
logo = {
url => project_homepage,
src => '/Pics/openlogo-nd-25.png',
@@@ -51,28 -52,19 +52,28 @@@
trademarknotes = g('%s is a <a href="%s">trademark</a> of %s',
organisation, trademark.url, trademark.name)
sponsors = [
{
- url => 'http://example.invalid/',
- name => 'Example Sponsor, Inc.',
+ url => 'http://1und1.de/',
+ name => '1&1 Internet AG',
},
{
- url => 'http://example2.invalid/',
- name => 'Example2 Sponsor, Inc.',
+ url => 'http://www.hp.com/',
+ name => 'Hewlett-Packard',
+ },
+ {
+ url => 'http://cs.helsinki.fi/index.en.html',
+ name => 'University of Helsinki - Department of Computer Science',
+ },
+ {
+ url => 'http://www.csail.mit.edu/',
+ name => 'MIT Computer Science & Artificial Intelligence Lab',
},
]
-%]
[%-
# possible values for importance: high, normal, low
- sitewidemsg = { importance => "high",
- txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+# sitewidemsg = { importance => "high",
+# txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+# txt => "Site maintainance in progress, some temporary
problems might occour." }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
