From 56d919ed524189eb7e34f9109613f98d10befbbc Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Fri, 1 Jan 2010 15:46:27 +0100 Subject: [PATCH] raff cleanup --- manifests/site.pp | 2 +- modules/exim/templates/virtualdomains.erb | 3 --- modules/munin-node/templates/munin-node.plugin.conf.erb | 2 +- modules/samhain/templates/samhainrc.erb | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 54711fe0..092f3212 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -71,7 +71,7 @@ node default { } case $hostname { - rietz,raff,klecker,ravel,senfl: { include named::secondary } + rietz,klecker,ravel,senfl: { include named::secondary } } case $hostname { diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index eb0301fb..b814bbc4 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -49,9 +49,6 @@ nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/" when "powell.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/org/packages.debian.org/mail/" - #when "raff.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail -#logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail" - when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail" when "ries.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb index fbf15397..b5012f7d 100644 --- a/modules/munin-node/templates/munin-node.plugin.conf.erb +++ b/modules/munin-node/templates/munin-node.plugin.conf.erb @@ -88,7 +88,7 @@ group maillog [bind*] <%= out = case hostname - when "geo1","geo2","geo3","raff" then "group bind + when "geo1","geo2","geo3" then "group bind env.logfile /var/log/bind9/geoip-query.log" else "group adm" end diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 3b1c6c3a..64ebe228 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -368,7 +368,7 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg" when "handel.debian.org": extrafiles="dir=8/etc/puppet" when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm" when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns" -when /(raff|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind +when /(senfl|ravel|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind file=/etc/bind/named.conf.debian-zones" end extrafiles -- 2.39.2