From 4afbb6552d3b4c54230f07fa57c4c781b3b9a9d7 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 30 Jan 2017 19:39:13 +0100 Subject: [PATCH] put puppet config for ftp.d.o onto klecker --- hieradata/common.yaml | 2 ++ modules/roles/manifests/init.pp | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 1e6822a65..a59dcd0b5 100644 --- 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 4c07f648b..67675efc0 100644 --- 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 } -- 2.20.1