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 a59dcd0..1e6822a 100644 (file)
--- 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 67675ef..4c07f64 100644 (file)
--- 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
        }