From 90d74b627d41a7d9118a62b6aeb3cf55984aca9a Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Thu, 21 Jul 2011 00:10:17 +0200 Subject: [PATCH] ferm: introduce $BUILDD_SSH_ACCESS and use it for CARNET and kFreeBSD Signed-off-by: Martin Zobel-Helas --- modules/ferm/templates/defs.conf.erb | 11 +++++++---- modules/ferm/templates/me.conf.erb | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 0805b2f9..ddcf0d3c 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -199,8 +199,11 @@ @def $USER_aurel32 = (); @def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net + +@def $BUILDD_SSH_ACCESS = (); +@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg +@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 70.103.162.29); # master +@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel @def $FREEBSD_SSH_ACCESS = (); -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_christoph $USER_aurel32); -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 194.177.211.200); # grieg -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 70.103.162.29); # master -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 206.12.19.5); # ravel +@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS); +@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph $USER_aurel32); # buildd admins diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 1637b3b8..d60ff069 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -18,8 +18,7 @@ end if %w{lebrun schroeder}.include?(hostname) then out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );' ssh4allowed << '$CARNET' - ssh4allowed << '70.103.162.29' # master - ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm) + ssh4allowed << '$BUILDD_SSH_ACCESS' end if %w{beethoven}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' -- 2.39.2