From 9f609e7990fefc6dc4cc5fce1b1a6e40f12481c6 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Mar 2016 10:26:48 +0100
Subject: [PATCH] remove gluck and rietz from puppet config

---
 hieradata/common.yaml                 |  1 -
 modules/debian-org/misc/local.yaml    |  6 ------
 modules/ferm/manifests/per-host.pp    |  2 +-
 modules/roles/manifests/init.pp       |  5 -----
 modules/roles/manifests/www_mirror.pp | 15 ---------------
 5 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 modules/roles/manifests/www_mirror.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 29368cc12..2561d8eb1 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -158,7 +158,6 @@ roles:
     - wolkenstein.debian.org
   weblog_provider:
     - busoni.debian.org
-    - gluck.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index effe0a89f..682ba2cf4 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -40,7 +40,6 @@ nameinfo:
   gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
   gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
   glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
-  gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
   handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
   harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
@@ -92,7 +91,6 @@ nameinfo:
   rainier.debian.org: Ivy Priaulx Rainier (February 3rd, 1903 - October 10th, 1986)
   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)
   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)
   schroeder.debian.org: Hermann Schroeder (March 26th, 1904 - October 7th, 1984)
@@ -152,7 +150,6 @@ host_settings:
     - vento.debian.org
     - wuiet.debian.org
   apache2_security_mirror:
-    - gluck.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
@@ -164,13 +161,10 @@ host_settings:
     - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
-  apache2_www_mirror:
-    - gluck.debian.org
   not-bacula-client:
     # decommissioning
     - rautavaara.debian.org
     # mirrors, secondaries, syncproxies
-    - gluck.debian.org
     - pkgmirror-1and1.debian.org
     - steffani.debian.org
     # porterbox
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 3876d2a30..19f276091 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [glinka,rietz] {
+	if $::hostname in [glinka] {
 		ferm::rule { 'dsa-rsync':
 			domain      => '(ip ip6)',
 			description => 'Allow rsync access',
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3e2b57523..9fd39f98e 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -69,11 +69,6 @@ class roles {
 		include roles::security_mirror
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
-	}
-
 	if has_role('mirror_debug') {
 		include roles::debug_mirror
 	}
diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
deleted file mode 100644
index 5d6a2f49b..000000000
--- a/modules/roles/manifests/www_mirror.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class roles::www_mirror {
-	# see also static mirrors.
-
-	$wwwdo_document_root = '/srv/www.debian.org/www'
-	$vhost_listen = '*:80'
-	$vhost_listen_443 = '*:443'
-	apache2::site { '005-www.debian.org':
-		site   => 'www.debian.org',
-		content => template('roles/apache-www.debian.org.erb'),
-	}
-
-	ssl::service { 'www.debian.org':
-		notify => Service['apache2'],
-	}
-}
-- 
2.20.1