sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch debian to deb.debian.org

Browse Source 
Per [1] this is the "official" CDN mirror, which I think is the most
appropriate for the default.  I think this addresses the concerns
httpredir service, which I don't think ever quite got out of beta.

[1] https://wiki.debian.org/DebianGeoMirror

Change-Id: I55f2a00b8bbb0f0a20d3be229e4c2c32a7b69057
This commit is contained in:
Ian Wienand 2017-05-19 14:25:47 +10:00 committed by Andreas Florath
parent 94ab9e2e7e
commit 9eb71a1fe0
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
View File

@ -4,7 +4,7 @@ export DIB_RELEASE=${DIB_RELEASE:-stable}
if [ -n "${DIB_DEBIAN_DISTRIBUTION_MIRROR:-}" ]; then if [ -n "${DIB_DEBIAN_DISTRIBUTION_MIRROR:-}" ]; then
DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_DISTRIBUTION_MIRROR DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_DISTRIBUTION_MIRROR
fi fi
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian} export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://deb.debian.org/debian}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }

7
diskimage_builder/elements/debootstrap/README.rst
View File

@ -14,16 +14,11 @@ There are two ways to configure apt-sources:
overwrite the two environment variables to adapt the behavior: overwrite the two environment variables to adapt the behavior:
* ``DIB_DISTRIBUTION_MIRROR``: the mirror to use (default: * ``DIB_DISTRIBUTION_MIRROR``: the mirror to use (default:
`<http://ftp.us.debian.org/debian>`__) `<http://deb.debian.org/debian>`__)
* ``DIB_DEBIAN_COMPONENTS``: (default: ``main``) a comma * ``DIB_DEBIAN_COMPONENTS``: (default: ``main``) a comma
separated list of components. For Debian this can be separated list of components. For Debian this can be
e.g. ``main,contrib,non-free``. e.g. ``main,contrib,non-free``.
Note it is not recommended to use
`<http://httpredir.debian.org/>`__ for ``DIB_DISTRIBUTION_MIRROR``
due to how unreliable it is. Be sure to select a mirror from the
official mirror list at `<https://www.debian.org/mirror/list>`__
By default only the ``main`` component is used. If By default only the ``main`` component is used. If
``DIB_DEBIAN_COMPONENTS`` (comma separated) from the ``DIB_DEBIAN_COMPONENTS`` (comma separated) from the
``debootstrap`` element has been set, that list of components will ``debootstrap`` element has been set, that list of components will