From 5e20ca41515bf2d1b6a13745edeecfafd7fd3f59 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 7 Mar 2016 20:26:52 +0100
Subject: [PATCH] saens is history

---
 modules/apache2/templates/default-index.html | 12 ------------
 modules/debian-org/misc/local.yaml           |  3 ---
 modules/exim/templates/locals.erb            |  6 ------
 3 files changed, 21 deletions(-)

diff --git a/modules/apache2/templates/default-index.html b/modules/apache2/templates/default-index.html
index 02ba1bf3c..ffb58f70a 100644
--- a/modules/apache2/templates/default-index.html
+++ b/modules/apache2/templates/default-index.html
@@ -11,18 +11,6 @@ This is <%= hostname %>, a system run by and for the <a href="https://www.debian
 She does stuff.
 What kind of stuff and who our kind sponsors are you might learn on
 <a href="https://db.debian.org/machines.cgi?host=<%= hostname %>">db.debian.org</a>.
-<% if hostname == "saens" -%>
-<p>
-This host used to be ftp.debian.org (just another
-mirror, not the master site - that is ftp-master.debian.org) a long
-time ago.
-<p>
-As of May 2009 it is part of <a href="http://security.debian.org/">security(.us).debian.org</a>,
-serving the security archive.
-<p>
-For a list of mirrors of the main debian archive please visit the
-Debian website at <a href="https://www.debian.org/mirror/list">http://www.debian.org/mirror/list</a>.
-<% end -%>
 
 <P>
 <HR NOSHADE />
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 0eab74364..8c41d1b16 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -94,7 +94,6 @@ nameinfo:
   rapoport.debian.org: Eda Rothstein Rapoport (December 25th, 1890 - May 9th, 1968)
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
-  saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
   samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa.
   santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989)
   schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630)
@@ -162,7 +161,6 @@ host_settings:
     - mirror-isc.debian.org
     - mirror-umn.debian.org
     - lobos.debian.org
-    - saens.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
     - sechter.debian.org
@@ -179,7 +177,6 @@ host_settings:
     - gluck.debian.org
     - pkgmirror-1and1.debian.org
     - schein.debian.org
-    - saens.debian.org
     - senfter.debian.org
     - spohr.debian.org
     - steffani.debian.org
diff --git a/modules/exim/templates/locals.erb b/modules/exim/templates/locals.erb
index 81bc06db7..75de4782b 100644
--- a/modules/exim/templates/locals.erb
+++ b/modules/exim/templates/locals.erb
@@ -3,9 +3,3 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%=
-locals = case fqdn
-        when "saens.debian.org" then "debian-mirror.cs.umn.edu"
-end
-locals
-%>
-- 
2.20.1