From 65c3333549a7b7db89fd908a68cc337431e8189b Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 21 Oct 2007 14:34:10 +0200 Subject: [PATCH] html/download.tmpl: Make security download text configurable Move all Debian specific information to config.tmpl. --- templates/config.tmpl | 3 +++ templates/html/download.tmpl | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/config.tmpl b/templates/config.tmpl index bb124e7..def9bae 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -13,6 +13,9 @@ ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' mirror_url = 'http://ftp.debian.org/' + security_mirror = 'security.debian.org' + security_mirror_url = security_mirror _ '/debian-security' + security_suite_suffix = '/updates' changelogs_url = 'http://packages.debian.org/changelogs/' policy_url = 'http://www.debian.org/doc/debian-policy/' cn_help_url = homepage _ 'intro/cn' diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl index 5af883d..66b9212 100644 --- a/templates/html/download.tmpl +++ b/templates/html/download.tmpl @@ -30,7 +30,7 @@ deb http://[% mirrors.$archive.europa.0 %] [% suite %] main [% section

[% g('Replacing %s with the mirror in question.', mirrors.$archive.europa.0) %] [% ELSE %]

-deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [% section IF section != main_section %]
+deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] main [% section IF section != main_section %]
 
[%- END %] [% IF suite == "experimental" %] @@ -73,8 +73,9 @@ deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [% [% ELSE %]

[% g('You can download the requested file from the %s subdirectory at:', filename.directory) %]

- -

[% g('Debian security updates are currently officially distributed only via security.debian.org.') %]

+ +

[% g('%s security updates are officially distributed only via %s.', + organisation, security_mirror) %]

[% END %]
-- 2.39.2