From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 23 Feb 2017 16:05:34 +0000 (+0100)
Subject: add klecker to debian_mirror_onion
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a173e2ae5e6d020b27810fc02b4e6c497af2e67f;p=mirror%2Fdsa-puppet.git

add klecker to debian_mirror_onion
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f43b586d1..2e77378af 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -221,6 +221,7 @@ roles:
     - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
+    - klecker.debian.org
     - bilbao.debian.org
     - mirror-isc.debian.org
   historical_master:
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 67456f83a..a852abd5b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -317,9 +317,6 @@ 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
 	}