Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 6b44e93..b9dcbf1 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -153,6 +153,7 @@ host_settings:
     - ravel.debian.org
     - spohr.debian.org
     - valente.debian.org
+    - quantz.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - lobos.debian.org

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index c39b03d..9748823 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -196,4 +196,6 @@
 @def $USER_aurel32 = ();
 @def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net
 @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
-@def $FREEBSD_SSH_ACCESS = ($DSA_IPS $USER_kibi $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ();
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_kibi $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 194.177.211.200); # grieg

diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml
index 8f9efa2..7593c3a 100644 (file)
--- a/modules/portforwarder/misc/config.yaml
+++ b/modules/portforwarder/misc/config.yaml
@@ -25,13 +25,12 @@ paganini.debian.org:
     target_host: samosa.debian.org
     target_port: 5441
 
-# qa->projectb mirror
 quantz.debian.org:
+  # qa->projectb mirror
   - source_bind_port: 5433
     target_host: merkel.debian.org
     target_port: 5433
-# qa->udd
-quantz.debian.org:
+  # qa->udd
   - source_bind_port: 5441
     target_host: samosa.debian.org
     target_port: 5441

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index b7c6232..3a557ea 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -29,8 +29,6 @@ Host_Alias    ZIVITHOSTS      = zelenka, zandonai
 Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
 Host_Alias     MPTRAIDHOSTS    = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
-# User alias specification
-User_Alias     QACORE          = aba, djpig, geissert, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
 
 # Cmnd alias specification
 
@@ -99,7 +97,7 @@ nagios                beethoven=(debbackup)   NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %volatile      ALL=(volatile)  ALL
 %wbadm         ALL=(wbadm)     ALL
 %wikiadm       ALL=(wiki)      ALL
-QACORE         QAHOSTS=(qa)    ALL
+%qa-core       QAHOSTS=(qa)    ALL
 
 # some groups are in apachectrl on "their" hosts so they can reload apache and update their vhost
 %apachectrl    ALL=(root)      /usr/sbin/apache2-vhost-update