Bug#798996: apt-setup: Please refer to httpredir.debian.org over ftp.debian.org in commented-out examples

[Chris Lamb]

Package: apt-setup
Version: 1:0.102
Severity: wishlist
Tags: patch

Hi,

Now that httpredir is under debian.org, it makes sense to refer to
httpredir.debian.org over ftp.debian.org in the (NB.) commented-out
example entries.

Patch attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-

diff --git a/generators/92updates b/generators/92updates
index d68ca89..982be73 100755
--- a/generators/92updates
+++ b/generators/92updates
@@ -47,7 +47,7 @@ else
        echo "# are provided as examples, but you should amend them as 
appropriate" >> $file
        echo "# for your mirror of choice." >> $file
        echo "#" >> $file
-       echo "# deb http://ftp.debian.org/debian/ ${codename}-updates $dists" 
>> $file
+       echo "# deb http://httpredir.debian.org/debian/ ${codename}-updates 
$dists" >> $file
 fi
 if db_get netcfg/dhcp_options && \
    [ "$RET" = "Do not configure the network at this time" ]; then
@@ -72,7 +72,7 @@ fi
 if [ -n "$protocol" ] && [ -n "$host" ]; then
        echo "deb-src $protocol://${host}${directory} ${codename}-updates 
$dists" >> $file
 else
-       echo "# deb-src http://ftp.debian.org/debian/ ${codename}-updates 
$dists" >> $file
+       echo "# deb-src http://httpredir.debian.org/debian/ ${codename}-updates 
$dists" >> $file
 fi
 
 exit $CODE
diff --git a/generators/93backports b/generators/93backports
index 1021d5f..11b12ff 100755
--- a/generators/93backports
+++ b/generators/93backports
@@ -47,7 +47,7 @@ else
        echo "# are provided as examples, but you should amend them as 
appropriate" >> $file
        echo "# for your mirror of choice." >> $file
        echo "#" >> $file
-       echo "# deb http://ftp.debian.org/debian/ ${codename}-backports $dists" 
>> $file
+       echo "# deb http://httpredir.debian.org/debian/ ${codename}-backports 
$dists" >> $file
 fi
 if db_get netcfg/dhcp_options && \
    [ "$RET" = "Do not configure the network at this time" ]; then
@@ -72,7 +72,7 @@ fi
 if [ -n "$protocol" ] && [ -n "$host" ]; then
        echo "deb-src $protocol://${host}${directory} ${codename}-backports 
$dists" >> $file
 else
-       echo "# deb-src http://ftp.debian.org/debian/ ${codename}-backports 
$dists" >> $file
+       echo "# deb-src http://httpredir.debian.org/debian/ 
${codename}-backports $dists" >> $file
 fi
 
 exit $CODE