From: Stephen Gran <steve@lobefin.net>
Date: Sun, 16 Dec 2012 10:09:35 +0000 (+0000)
Subject: bye bye kassia
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b0dd1aa9d67bc92d097c1ad23f42bbedd173b756;p=mirror%2Fdsa-puppet.git

bye bye kassia

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index dfb4bd0fd..760ecec25 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -64,7 +64,6 @@ nameinfo:
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
   holter.debian.org: Iver Holter (December 13th, 1850 - January 27th, 1941)
   jenkins.debian.org: John Jenkins (1592 - 1678)
-  kassia.debian.org: Kassia (between 805 and 810 - bef. 867)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
   kokkonen.debian.org: Joonas Kokkonen (November 13th, 1921 - October 1st, 1996)
@@ -164,11 +163,9 @@ services:
   ftp_master:
     - franck.debian.org
   ftp.d.o:
-    - kassia.debian.org
     - klecker.debian.org
   ftp.upload.d.o:
     - franck.debian.org
-    - kassia.debian.org
     - ravel.debian.org
   mailrelay:
     - merikanto.debian.org
@@ -263,7 +260,6 @@ host_settings:
     - sompek.debian.org
   mail_port:
     ancina.debian.org: 2025
-    kassia.debian.org: 587
     klecker.debian.org: 587
     piatti.debian.org: 2025
     zappa.debian.org: 587
diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 0ae4254e5..fa6421e6f 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,13 +1,11 @@
 class roles::ftp {
 
 	$bind = $::hostname ? {
-		kassia  => '::ffff:130.89.149.226',
 		klecker => '::ffff:130.89.148.12',
 		default => '',
 	}
 
 	$bind6 = $::hostname ? {
-		kassia  => '2001:610:1908:a000::149:226',
 		klecker => '2001:610:1908:b000::148:12',
 		default => '',
 	}
diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 682d314ce..89fe6428d 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,21 +1,10 @@
 class roles::ftp_upload {
 
-	$bind = $::hostname ? {
-		kassia  => '::ffff:130.89.149.224',
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		kassia  => '2001:610:1908:a000:21b:78ff:fe75:3d46',
-		default => '',
-	}
-
 	vsftpd::site { 'ftp-upload':
 		banner     => 'ftp.upload.debian.org FTP server',
 		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
 		writable   => true,
 		chown_user => dak,
-		bind       => $bind,
 		root       => '/srv/upload.debian.org/ftp',
 	}
 
@@ -25,7 +14,6 @@ class roles::ftp_upload {
 			logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
 			writable   => true,
 			chown_user => dak,
-			bind       => $bind6,
 			root       => '/srv/upload.debian.org/ftp',
 		}
 	}