From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 30 Jan 2017 18:52:32 +0000 (+0100)
Subject: Revert "put puppet config for ftp.d.o onto klecker"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ae4c4d74b68e251770d814e97790e0536640fcb6;p=mirror%2Fdsa-puppet.git

Revert "put puppet config for ftp.d.o onto klecker"

This reverts commit 4afbb6552d3b4c54230f07fa57c4c781b3b9a9d7.

Our fastly config relies on / returning 200 OK (not a redirect).  So
disabling this for now.
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a59dcd0b5..1e6822a65 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -211,11 +211,9 @@ roles:
     - vittoria.debian.org
   debian_mirror:
     - bilbao.debian.org
-    - klecker.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
     - bilbao.debian.org
-    - klecker.debian.org
     - mirror-isc.debian.org
   debug_mirror:
     - klecker.debian.org
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 67675efc0..4c07f648b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -310,6 +310,9 @@ class roles {
 		include roles::ports_mirror
 	}
 
+	if $::hostname in [klecker] {
+		onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
+	}
 	if has_role('onionbalance') {
 		include onion::balance
 	}