summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-07-07 12:30:55 +0100
committerColin Watson <cjwatson@debian.org>2019-07-07 12:55:27 +0100
commitea40db71626a52e89479ea6848d1462b9df334c7 (patch)
tree4a63d15877f97e687088bf39ba4f92e9744ecc3f /examples
parenteedede35793f1ca8d677b8e1b62838638a4e8e6a (diff)
make-local-mirror: Remove long-obsolete non-US mentions
Diffstat (limited to 'examples')
-rw-r--r--examples/local-mirror.config1
-rwxr-xr-xexamples/make-local-mirror11
2 files changed, 2 insertions, 10 deletions
diff --git a/examples/local-mirror.config b/examples/local-mirror.config
index 57bc6fe..11b0479 100644
--- a/examples/local-mirror.config
+++ b/examples/local-mirror.config
@@ -8,7 +8,6 @@ suite testing dists/testing main contrib non-free
suite testing-proposed-updates dists/testing-proposed-updates main contrib non-free
suite unstable dists/unstable main contrib non-free
suite experimental dists/experimental main contrib non-free
-suite stable/non-US dists/stable-non-US main contrib non-free
suite stable/updates dists/stable-security main contrib non-free
suite testing/updates dists/testing-security main contrib non-free
# Uncomment the following lines if you are mirroring Ubuntu index files as
diff --git a/examples/make-local-mirror b/examples/make-local-mirror
index 1676584..f0a3a76 100755
--- a/examples/make-local-mirror
+++ b/examples/make-local-mirror
@@ -12,7 +12,6 @@ set -e
# change the lists of distributions and architectures.
HOST_MAIN=${HOST_MAIN:-'ftp://ftp.debian.org/debian'}
-HOST_NONUS=${HOST_NONUS:-'ftp://non-us.debian.org/debian-non-US'}
HOST_SECURITY=${HOST_SECURITY:-'ftp://security.debian.org/debian-security'}
HOST_UBUNTU=${HOST_UBUNTU:-'http://archive.ubuntu.com/ubuntu'}
HOST_UBUNTU_PORTS=${HOST_UBUNTU_PORTS:-'http://ports.ubuntu.com/ubuntu-ports'}
@@ -29,9 +28,9 @@ mkdir -p dists
cd dists
# To mirror Ubuntu index files as well, run this script with:
-# ARCHIVES='main non-US security ubuntu ubuntu-ports'
+# ARCHIVES='main security ubuntu ubuntu-ports'
# set in the environment.
-archives=${ARCHIVES:-'main non-US security'}
+archives=${ARCHIVES:-'main security'}
for archive in $archives; do
case $archive in
@@ -41,12 +40,6 @@ for archive in $archives; do
suites='stable proposed-updates testing testing-proposed-updates unstable experimental'
components='main contrib non-free'
;;
- non-US)
- host="$HOST_NONUS"
- suitesuffix='/non-US'
- suites='stable'
- components='main contrib non-free'
- ;;
security)
host="$HOST_SECURITY"
suitesuffix='/updates'