From: Peter Palfrader Date: Wed, 24 Feb 2010 15:40:24 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe3c81154c72b3fd5d5911fb3893021ffe6032e0;hp=25c41a5d7bde6fe1416b5404286326abc24bb42c;p=dsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (24 commits) stop doubling up an entry add puppetmaster role be a little more liberal about throwing away MS traffic this should be empty for those hosters use the right list of hosts move inclusion of samhain to the end of the block, so it knows about all other classes included clean up samhain template by role instead of by hostname and even more carefully this time skip hosts without ip addresses in ldap bartok gets ferm add debian hosts to the list and recursors should allow localnets ... name new class correctly add bartok as recursor for manda add bartok as a recursor add local DNS recursor class /etc/ferm is now also (kind of, almost) under puppet control ferm.conf is now (kind of, almost) under puppet control and name them usefully use v4 for iptables and v6 for ip6tables ... --- diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index d2147e93..698ac30d 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -114,6 +114,7 @@ dak ries=(archvsync) NOPASSWD:/home/archvsync/runmirrors planet senfl=(archvsync) NOPASSWD: /home/archvsync/bin/runplanet "" # archvsync triggers snapshot archvsync stabile=(snapshot) NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger +archvsync sibelius=(snapshot) NOPASSWD: /srv/2ndsnapshot/bin/update-trigger # dak stuff %debian-release ries=(dak) /usr/local/bin/dak transitions --import * %ftpteam ries=(dak) /usr/local/bin/dak transitions --import *