From: Stephen Gran <steve@lobefin.net>
Date: Fri, 25 Mar 2011 07:19:01 +0000 (+0000)
Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a057a77fc2e7f761e7d6ae69655e91ff60d653a0;hp=103c20fec9e53838c741754d4b80ddb24345e9d4;p=mirror%2Fdsa-puppet.git

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 fdb66a814..e5ef7166f 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -204,10 +204,8 @@ host_settings:
     - goedel.debian.org
     - goetz.debian.org
     - krenek.debian.org
-    - lafayette.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
-    - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
     - mundy.debian.org
@@ -223,6 +221,7 @@ host_settings:
     - vitry.debian.org
     - voltaire.debian.org
     - zandonai.debian.org
+    - zee.debian.org
   squeeze:
     - alkman.debian.org
     - arne.debian.org
@@ -255,6 +254,7 @@ host_settings:
     - lotti.debian.org
     - luchesi.debian.org
     - merikanto.debian.org
+    - morricone.debian.org
     - murphy.debian.org
     - nono.debian.org
     - piatti.debian.org
@@ -267,6 +267,7 @@ host_settings:
     - rietz.debian.org
     - rossini.debian.org
     - salieri.debian.org
+    - samosa.debian.org
     - santoro.debian.org
     - scelsi.debian.org
     - schein.debian.org
@@ -408,5 +409,3 @@ host_settings:
     - widor.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
----
-
diff --git a/modules/nfs-server/files/nfs-kernel-server.default b/modules/nfs-server/files/nfs-kernel-server.default
index cd98ea413..d40255f5c 100644
--- a/modules/nfs-server/files/nfs-kernel-server.default
+++ b/modules/nfs-server/files/nfs-kernel-server.default
@@ -13,7 +13,7 @@ RPCNFSDPRIORITY=0
 # If you have a port-based firewall, you might want to set up
 # a fixed port here using the --port option. For more information, 
 # see rpc.mountd(8) or http://wiki.debian.org/?SecuringNFS
-RPCMOUNTDOPTS="-p 10002 --manage-gids"
+RPCMOUNTDOPTS="-p 10002"
 
 # Do you want to start the svcgssd daemon? It is only required for Kerberos
 # exports. Valid alternatives are "yes" and "no"; the default is "no".
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 8067e4e11..ed437c0a5 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -67,6 +67,7 @@ nagios		MEGARAIDHOSTS=(ALL)	NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog,
 nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
 
 # groups and their role accounts
+%backports	ALL=(backports)	ALL
 %buildd		ALL=(buildd)	ALL
 %d-i		ALL=(d-i)	ALL
 %dde		ALL=(dde)	ALL