examples: Update Ubuntu suites and architectures

3 files changed, 61 insertions, 56 deletions

diff --git a/examples/local-mirror.config b/examples/local-mirror.config
index 266e9dd..57bc6fe 100644
--- a/examples/local-mirror.config
+++ b/examples/local-mirror.config
@@ -13,7 +13,10 @@ 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
 # well.
-# suite warty dists/warty main restricted universe multiverse
-# suite hoary dists/hoary main restricted universe multiverse
-# suite breezy dists/breezy main restricted universe multiverse
-# suite dapper dists/dapper main restricted universe multiverse
+# suite precise dists/precise main restricted universe multiverse
+# suite trusty dists/trusty main restricted universe multiverse
+# suite xenial dists/xenial main restricted universe multiverse
+# suite bionic dists/bionic main restricted universe multiverse
+# suite cosmic dists/cosmic main restricted universe multiverse
+# suite disco dists/disco main restricted universe multiverse
+# suite eoan dists/eoan main restricted universe multiverse
diff --git a/examples/make-local-mirror b/examples/make-local-mirror
index 5cb6370..1676584 100755
--- a/examples/make-local-mirror
+++ b/examples/make-local-mirror
@@ -56,13 +56,13 @@ for archive in $archives; do
 	ubuntu)
 	    host="$HOST_UBUNTU"
 	    suitesuffix=''
-	    suites='warty hoary breezy dapper'
+	    suites='precise trusty xenial bionic cosmic disco eoan'
 	    components='main restricted universe multiverse'
 	    ;;
 	ubuntu-ports)
 	    host="$HOST_UBUNTU_PORTS"
 	    suitesuffix=''
-	    suites='hoary breezy dapper'
+	    suites='precise trusty xenial bionic cosmic disco eoan'
 	    components='main restricted universe multiverse'
 	    ;;
 	*)
@@ -82,41 +82,33 @@ for archive in $archives; do
 
 	mkdir -p "$suitehere"
 	root=dists
-	case $suite in
-	    oldstable)
+	case $archive:$suite in
+	    *:oldstable)
 		arches='alpha arm i386 m68k powerpc sparc'
 		;;
-	    stable)
+	    *:stable)
 		arches='alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc'
 		;;
-	    testing)
+	    *:testing)
 		arches='alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc'
 		;;
-	    unstable|experimental)
+	    *:unstable|*:experimental)
 		arches='alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc'
 		;;
-	    warty)
-		arches='amd64 i386 powerpc'
+	    ubuntu:*)
+		arches='amd64 i386'
 		;;
-	    hoary)
-		case $archive in
-		    ubuntu)
-			arches='amd64 i386 powerpc'
-			;;
-		    ubuntu-ports)
-			arches='ia64 sparc'
-			;;
-		esac
+	    ubuntu-ports:precise)
+		arches='armel armhf powerpc'
 		;;
-	    breezy|dapper)
-		case $archive in
-		    ubuntu)
-			arches='amd64 i386 powerpc'
-			;;
-		    ubuntu-ports)
-			arches='hppa ia64 sparc'
-			;;
-		esac
+	    ubuntu-ports:trusty)
+		arches='arm64 armhf powerpc ppc64el'
+		;;
+	    ubuntu-ports:xenial)
+		arches='arm64 armhf powerpc ppc64el s390x'
+		;;
+	    ubuntu-ports:bionic|ubuntu-ports:cosmic|ubuntu-ports:disco|ubuntu-ports:eoan)
+		arches='arm64 armhf ppc64el s390x'
 		;;
 	esac
 	for component in $components; do
diff --git a/examples/ubuntu.com.config b/examples/ubuntu.com.config
index a71e1c5..d8a8c34 100644
--- a/examples/ubuntu.com.config
+++ b/examples/ubuntu.com.config
@@ -1,27 +1,37 @@
 # This madison-lite configuration is suitable for a typical ubuntu.com host
 # with a complete mirror.
-suite dapper dists/dapper main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite dapper-security dists/dapper-security main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite dapper-proposed dists/dapper-proposed main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite dapper-updates dists/dapper-updates main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite dapper-backports dists/dapper-backports main main/debian-installer restricted universe multiverse
-suite edgy dists/edgy main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite edgy-security dists/edgy-security main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite edgy-proposed dists/edgy-proposed main main/debian-installer restricted universe multiverse
-suite edgy-updates dists/edgy-updates main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite edgy-backports dists/edgy-backports main main/debian-installer restricted universe universe/debian-installer multiverse
-suite feisty dists/feisty main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite feisty-security dists/feisty-security main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite feisty-proposed dists/feisty-proposed main main/debian-installer restricted universe multiverse
-suite feisty-updates dists/feisty-updates main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite feisty-backports dists/feisty-backports main main/debian-installer restricted universe universe/debian-installer multiverse
-suite gutsy dists/gutsy main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite gutsy-security dists/gutsy-security main main/debian-installer restricted universe universe/debian-installer multiverse
-suite gutsy-proposed dists/gutsy-proposed main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite gutsy-updates dists/gutsy-updates main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite gutsy-backports dists/gutsy-backports main main/debian-installer restricted universe multiverse
-suite hardy dists/hardy main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
-suite hardy-security dists/hardy-security main restricted universe multiverse
-suite hardy-proposed dists/hardy-proposed main restricted universe multiverse
-suite hardy-updates dists/hardy-updates main restricted universe multiverse
-suite hardy-backports dists/hardy-backports main restricted universe multiverse
+suite precise dists/precise main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite precise-security dists/precise-security main restricted universe multiverse
+suite precise-proposed dists/precise-proposed main restricted universe multiverse
+suite precise-updates dists/precise-updates main restricted universe multiverse
+suite precise-backports dists/precise-backports main restricted universe multiverse
+suite trusty dists/trusty main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite trusty-security dists/trusty-security main restricted universe multiverse
+suite trusty-proposed dists/trusty-proposed main restricted universe multiverse
+suite trusty-updates dists/trusty-updates main restricted universe multiverse
+suite trusty-backports dists/trusty-backports main restricted universe multiverse
+suite xenial dists/xenial main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite xenial-security dists/xenial-security main restricted universe multiverse
+suite xenial-proposed dists/xenial-proposed main restricted universe multiverse
+suite xenial-updates dists/xenial-updates main restricted universe multiverse
+suite xenial-backports dists/xenial-backports main restricted universe multiverse
+suite bionic dists/bionic main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite bionic-security dists/bionic-security main restricted universe multiverse
+suite bionic-proposed dists/bionic-proposed main restricted universe multiverse
+suite bionic-updates dists/bionic-updates main restricted universe multiverse
+suite bionic-backports dists/bionic-backports main restricted universe multiverse
+suite cosmic dists/cosmic main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite cosmic-security dists/cosmic-security main restricted universe multiverse
+suite cosmic-proposed dists/cosmic-proposed main restricted universe multiverse
+suite cosmic-updates dists/cosmic-updates main restricted universe multiverse
+suite cosmic-backports dists/cosmic-backports main restricted universe multiverse
+suite disco dists/disco main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite disco-security dists/disco-security main restricted universe multiverse
+suite disco-proposed dists/disco-proposed main restricted universe multiverse
+suite disco-updates dists/disco-updates main restricted universe multiverse
+suite disco-backports dists/disco-backports main restricted universe multiverse
+suite eoan dists/eoan main main/debian-installer restricted restricted/debian-installer universe universe/debian-installer multiverse
+suite eoan-security dists/eoan-security main restricted universe multiverse
+suite eoan-proposed dists/eoan-proposed main restricted universe multiverse
+suite eoan-updates dists/eoan-updates main restricted universe multiverse
+suite eoan-backports dists/eoan-backports main restricted universe multiverse