put puppet config for ftp.d.o onto klecker

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 1e6822a..a59dcd0 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -211,9 +211,11 @@ 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 4c07f64..67675ef 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -310,9 +310,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
        }