html/download.tmpl: Make security download text configurable

Move all Debian specific information to config.tmpl.

diff --git a/templates/config.tmpl b/templates/config.tmpl
index bb124e79c22fd52d49fe81145e549969aa114660..def9bae5351a6f23bab2ec8754a9a0789225f7c5 100644 (file)
--- 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 5af883d5f7decc8308d0d933b912d406a0acdc8d..66b921204a177ac1c0f32d45c13a084803868ffc 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -30,7 +30,7 @@ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section
 <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
 [% ELSE %]
 <pre>
-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 %]
 </pre>
 [%- END %]
 [% IF suite == "experimental" %]
@@ -73,8 +73,9 @@ deb http://security.debian.org/debian-security [% suite _ "/updates" %] main [%
   </div>
 [% ELSE %]
 <p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at:', filename.directory) %]</p>
-<ul><li><a href="http://security.debian.org/debian-security/[% filename.full %]">security.debian.org/debian-security</a></li></ul>
-<p>[% g('Debian security updates are currently officially distributed only via <tt>security.debian.org</tt>.') %]</p>
+<ul><li><a href="[% 'http://' _ security_mirror_url _ filename.full %]">[% security_mirror_url %]</a></li></ul>
+<p>[% g('%s security updates are officially distributed only via <tt>%s</tt>.',
+       organisation, security_mirror) %]</p>
 [% END %]
 
 <div id="pdownloadnotes">