From 432da1dae7fc3bd13f91fed6cb9a3b02baafa4eb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 4 Apr 2013 14:18:19 +0200 Subject: [PATCH] samosa is no more --- modules/portforwarder/misc/config.yaml | 23 ------------------- .../static-master-authorized_keys.erb | 2 -- 2 files changed, 25 deletions(-) diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index b03fb267..f8d6dbbb 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -5,30 +5,12 @@ # port on the remote instead of just encoding it in authkeys. # from host:port to host:port -#master.debian.org: -# - source_bind_port: 5441 -# target_host: samosa.debian.org -# target_port: 5441 - -samosa.debian.org: - - source_bind_port: 5433 - target_host: grieg.debian.org - target_port: 5433 - -paganini.debian.org: - - source_bind_port: 5441 - target_host: samosa.debian.org - target_port: 5441 quantz.debian.org: # qa->projectb mirror - source_bind_port: 5433 target_host: ries.debian.org target_port: 5433 - # qa->udd - - source_bind_port: 5441 - target_host: samosa.debian.org - target_port: 5441 nono.debian.org: # nm->projectb mirror @@ -60,11 +42,6 @@ ries.debian.org: target_host: franck.debian.org target_port: 5433 -wagner.debian.org: - - source_bind_port: 5441 - target_host: samosa.debian.org - target_port: 5441 - blavet.debian.org: # emdebian->projectb mirror - source_bind_port: 5433 diff --git a/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb b/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb index 6f04c69f..d116dcd7 100644 --- a/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb +++ b/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb @@ -24,8 +24,6 @@ localinfo.keys.sort.each do |node| end end -mirrors << { 'node' => 'wagner.debian.org', 'addr' => allnodeinfo['wagner.debian.org']['ipHostNumber'], 'key' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXHFIkIhOC5iDa0d0IN5w6tUUL2T2iXCYcS2+dandE9f550OpKQ/evUZhw4EERNYDA3G7GV3jJzQR0j/KZWJUtDCichmqS94xJqXURmZVNeLXWY9x/N7CB1iG1Iblu6sgyTUrs7N6Wb0fUab3AXAi9KIXdwNLY622reR9T//bRULPVIl5VFpYtGBPT9n3wR7fLQ4ndEcUmEGcM4jRbpLmye4QGgJotuzeBWUpX+U648Yly6U7NlAJIWPUt7hEzMz2AC81SLhGCwTk6sb19n2dO6WN2ndynp8PLG1emtgd1/DaeaRyPcitoWgSoDNgKNk3zLIDtCdSYvFI8xXrm6cK3 staticsync@wagner'} - lines = [] for m in mirrors: lines << '# ' + m['node'] -- 2.39.2