From: Julien Cristau <jcristau@debian.org>
Date: Thu, 1 Feb 2018 18:47:51 +0000 (+0100)
Subject: get rid of pizzetti
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2f575463b083cdc39b98067d93855f870c3e57e7;p=mirror%2Fdsa-puppet.git

get rid of pizzetti
---

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index d247408bf..fb862f686 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -70,7 +70,6 @@ nameinfo:
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
   pieta.debian.org: Michielina della Pietà (fl. ca. 1700 - 1744)
   pinel.debian.org: Julie Pinel (fl. 1710 - 1737)
-  pizzetti.debian.org: Ildebrando Pizzetti (20 September 1880 - 13 February 1968)
   plummer.debian.org: John Plummer (c. 1410 - c. 1483)
   porta.debian.org: Giovanni Porta (c. 1675 - 21 June 1755)
   prokofiev.debian.org: Sergei Sergeyevich Prokofiev (April 27th, 1891 - March 5th, 1953)
@@ -145,7 +144,6 @@ host_settings:
     - harris.debian.org
     - minkus.debian.org
     - partch.debian.org
-    - pizzetti.debian.org
     - plummer.debian.org
     - smetana.debian.org
     - zelenka.debian.org
diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index f29d0a0f9..4e71f1f17 100755
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -66,41 +66,31 @@ get_suites() {
 
 extra=""
 
-case `hostname` in
-    pizzetti)
-        archs="ppc64"
-        extra="$extra -m http://ftp.de.debian.org/debian-ports"
-        extra="$extra -k /root/debian-ports-archive-2017.gpg"
-        extra="$extra -I debian-ports-archive-keyring"
-        ;;
-    *)
-        archs="$DPKGARCH"
-        case "$DPKGARCH" in
-            amd64)
-                archs="$archs i386"
-                ;;
-            arm64)
-                archs="$archs armhf armel"
-                ;;
-            armhf)
-                if [ "$(uname -m)" = "aarch64" ] ; then
-                    archs="$archs arm64"
-                fi
-                archs="$archs armel"
-                ;;
-            armel)
-                if [ "$(uname -m)" = "armv7l" ] && grep -w vfpv3 -q /proc/cpuinfo ; then
-                    archs="$archs armhf"
-                fi
-                ;;
-            mips64el)
-                archs="$archs mipsel"
-                ;;
-            mipsel)
-                archs="$archs mips64el"
-                ;;
-        esac
-    ;;
+archs="$DPKGARCH"
+case "$DPKGARCH" in
+    amd64)
+	archs="$archs i386"
+	;;
+    arm64)
+	archs="$archs armhf armel"
+	;;
+    armhf)
+	if [ "$(uname -m)" = "aarch64" ] ; then
+	    archs="$archs arm64"
+	fi
+	archs="$archs armel"
+	;;
+    armel)
+	if [ "$(uname -m)" = "armv7l" ] && grep -w vfpv3 -q /proc/cpuinfo ; then
+	    archs="$archs armhf"
+	fi
+	;;
+    mips64el)
+	archs="$archs mipsel"
+	;;
+    mipsel)
+	archs="$archs mips64el"
+	;;
 esac
 
 err=0
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 295876ba5..7ee4aa3ef 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -35,7 +35,7 @@ Host_Alias	AACRAIDHOSTS	= pettersson
 Host_Alias	MEGARAIDHOSTS	= sibelius
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	BUILDD_MASTER	= wuiet
-Host_Alias	PORTERBOXES	= abel, amdahl, barriere, eller, harris, minkus, partch, plummer, pizzetti, zelenka
+Host_Alias	PORTERBOXES	= abel, amdahl, barriere, eller, harris, minkus, partch, plummer, zelenka
 Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a, piu-slave-ubc-01
 Host_Alias	MQ_HOSTS	= rainier, rapoport
 Host_Alias	JENKINSHOSTS	= jerea