]> git.donarmstrong.com Git - dsa-puppet.git/log
dsa-puppet.git
14 years agowhitespace nazi
Peter Palfrader [Mon, 1 Mar 2010 20:34:15 +0000 (21:34 +0100)]
whitespace nazi

14 years ago*ahem*
Peter Palfrader [Mon, 1 Mar 2010 20:32:47 +0000 (21:32 +0100)]
*ahem*

14 years agosudoers: Allow wbadm to do their stuff on grieg
Peter Palfrader [Mon, 1 Mar 2010 19:43:38 +0000 (20:43 +0100)]
sudoers: Allow wbadm to do their stuff on grieg

14 years agopuppet headers
Peter Palfrader [Mon, 1 Mar 2010 13:14:23 +0000 (14:14 +0100)]
puppet headers

14 years agoone accepts only TERM, the other only INT
Peter Palfrader [Sun, 28 Feb 2010 20:28:46 +0000 (21:28 +0100)]
one accepts only TERM, the other only INT

14 years agokill the daemon watcher for mpt-statusd as well
Peter Palfrader [Sun, 28 Feb 2010 20:26:00 +0000 (21:26 +0100)]
kill the daemon watcher for mpt-statusd as well

14 years agotry sigint
Peter Palfrader [Sun, 28 Feb 2010 20:19:09 +0000 (21:19 +0100)]
try sigint

14 years agoand a typo
Peter Palfrader [Sun, 28 Feb 2010 20:15:51 +0000 (21:15 +0100)]
and a typo

14 years agocosmetics
Peter Palfrader [Sun, 28 Feb 2010 20:14:07 +0000 (21:14 +0100)]
cosmetics

14 years agoand finally
Peter Palfrader [Sun, 28 Feb 2010 20:12:36 +0000 (21:12 +0100)]
and finally

14 years agonow
Peter Palfrader [Sun, 28 Feb 2010 20:11:53 +0000 (21:11 +0100)]
now

14 years agobetter
Peter Palfrader [Sun, 28 Feb 2010 20:11:28 +0000 (21:11 +0100)]
better

14 years ago*sigh*
Peter Palfrader [Sun, 28 Feb 2010 20:10:52 +0000 (21:10 +0100)]
*sigh*

14 years agobad puppet
Peter Palfrader [Sun, 28 Feb 2010 20:10:10 +0000 (21:10 +0100)]
bad puppet

14 years agono semicolon at least
Peter Palfrader [Sun, 28 Feb 2010 20:09:21 +0000 (21:09 +0100)]
no semicolon at least

14 years agoquote stuff?
Peter Palfrader [Sun, 28 Feb 2010 20:08:46 +0000 (21:08 +0100)]
quote stuff?

14 years agompt has funny ears
Peter Palfrader [Sun, 28 Feb 2010 20:06:44 +0000 (21:06 +0100)]
mpt has funny ears

14 years agosibelius has megaraid
Peter Palfrader [Sun, 28 Feb 2010 19:34:34 +0000 (20:34 +0100)]
sibelius has megaraid

14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 28 Feb 2010 19:33:26 +0000 (20:33 +0100)]
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:
  Fix typo
  add my ppp ip as well

14 years agofix typo
Peter Palfrader [Sun, 28 Feb 2010 19:33:02 +0000 (20:33 +0100)]
fix typo

14 years agoFix typo
Peter Palfrader [Sun, 28 Feb 2010 17:46:37 +0000 (18:46 +0100)]
Fix typo

14 years agoadd my ppp ip as well
Stephen Gran [Sun, 28 Feb 2010 16:25:06 +0000 (16:25 +0000)]
add my ppp ip as well

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge mptcontroller and mptraid facts
Peter Palfrader [Sun, 28 Feb 2010 16:17:51 +0000 (17:17 +0100)]
Merge mptcontroller and mptraid facts

14 years agoallow sudo to mpt-status on mpt raid hosts
Peter Palfrader [Sun, 28 Feb 2010 16:15:44 +0000 (17:15 +0100)]
allow sudo to mpt-status on mpt raid hosts

14 years agoAnd install mpt-status on mpt hosts
Peter Palfrader [Sun, 28 Feb 2010 16:12:06 +0000 (17:12 +0100)]
And install mpt-status on mpt hosts

14 years agomptraid fact
Peter Palfrader [Sun, 28 Feb 2010 16:10:44 +0000 (17:10 +0100)]
mptraid fact

14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 28 Feb 2010 16:00:27 +0000 (17:00 +0100)]
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:
  add fact for megaraid controllers
  strip some of the randomness

14 years agoNagios gets to run megaraid's megarc
Peter Palfrader [Sun, 28 Feb 2010 16:00:16 +0000 (17:00 +0100)]
Nagios gets to run megaraid's megarc

14 years agoadd fact for megaraid controllers
Stephen Gran [Sun, 28 Feb 2010 15:48:42 +0000 (15:48 +0000)]
add fact for megaraid controllers

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Thu, 25 Feb 2010 19:24:14 +0000 (19:24 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agostrip some of the randomness
Stephen Gran [Thu, 25 Feb 2010 19:24:10 +0000 (19:24 +0000)]
strip some of the randomness

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agohmm.
Peter Palfrader [Thu, 25 Feb 2010 19:18:34 +0000 (20:18 +0100)]
hmm.

14 years agoI hate you
Peter Palfrader [Thu, 25 Feb 2010 19:16:31 +0000 (20:16 +0100)]
I hate you

14 years agotry kernel
Peter Palfrader [Thu, 25 Feb 2010 19:14:46 +0000 (20:14 +0100)]
try kernel

14 years ago- -dsa in dsa-dsa-
Peter Palfrader [Thu, 25 Feb 2010 19:13:25 +0000 (20:13 +0100)]
- -dsa in dsa-dsa-

14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Thu, 25 Feb 2010 19:09:23 +0000 (20:09 +0100)]
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:
  line wrap motd

14 years agoTry to get a kfreebsd module going
Peter Palfrader [Thu, 25 Feb 2010 19:09:19 +0000 (20:09 +0100)]
Try to get a kfreebsd module going

14 years agoline wrap motd
Stephen Gran [Wed, 24 Feb 2010 22:10:04 +0000 (22:10 +0000)]
line wrap motd

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Wed, 24 Feb 2010 15:40:24 +0000 (16:40 +0100)]
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
  ...

14 years agoLet archvsync trigger snapshot (2nd snapshot instance) on sibelius
Peter Palfrader [Wed, 24 Feb 2010 15:39:48 +0000 (16:39 +0100)]
Let archvsync trigger snapshot (2nd snapshot instance) on sibelius

14 years agostop doubling up an entry
Stephen Gran [Wed, 24 Feb 2010 09:20:15 +0000 (09:20 +0000)]
stop doubling up an entry

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd puppetmaster role
Stephen Gran [Wed, 24 Feb 2010 09:16:08 +0000 (09:16 +0000)]
add puppetmaster role

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agobe a little more liberal about throwing away MS traffic
Stephen Gran [Wed, 24 Feb 2010 00:37:51 +0000 (00:37 +0000)]
be a little more liberal about throwing away MS traffic

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agothis should be empty for those hosters
Stephen Gran [Wed, 24 Feb 2010 00:25:30 +0000 (00:25 +0000)]
this should be empty for those hosters

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agouse the right list of hosts
Stephen Gran [Wed, 24 Feb 2010 00:21:10 +0000 (00:21 +0000)]
use the right list of hosts

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomove inclusion of samhain to the end of the block, so it knows about all other classe...
Stephen Gran [Tue, 23 Feb 2010 23:33:15 +0000 (23:33 +0000)]
move inclusion of samhain to the end of the block, so it knows about all other classes included

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoclean up samhain template by role instead of by hostname
Stephen Gran [Tue, 23 Feb 2010 23:32:54 +0000 (23:32 +0000)]
clean up samhain template by role instead of by hostname

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand even more carefully this time
Stephen Gran [Tue, 23 Feb 2010 19:46:07 +0000 (19:46 +0000)]
and even more carefully this time

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoskip hosts without ip addresses in ldap
Stephen Gran [Tue, 23 Feb 2010 19:45:13 +0000 (19:45 +0000)]
skip hosts without ip addresses in ldap

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agobartok gets ferm
Stephen Gran [Tue, 23 Feb 2010 19:38:49 +0000 (19:38 +0000)]
bartok gets ferm

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd debian hosts to the list
Stephen Gran [Tue, 23 Feb 2010 19:36:55 +0000 (19:36 +0000)]
add debian hosts to the list

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand recursors should allow localnets ...
Stephen Gran [Tue, 23 Feb 2010 19:33:03 +0000 (19:33 +0000)]
and recursors should allow localnets ...

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoname new class correctly
Stephen Gran [Tue, 23 Feb 2010 19:31:52 +0000 (19:31 +0000)]
name new class correctly

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd bartok as recursor for manda
Stephen Gran [Tue, 23 Feb 2010 19:31:08 +0000 (19:31 +0000)]
add bartok as recursor for manda

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd bartok as a recursor
Stephen Gran [Tue, 23 Feb 2010 19:30:34 +0000 (19:30 +0000)]
add bartok as a recursor

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd local DNS recursor class
Stephen Gran [Tue, 23 Feb 2010 19:29:54 +0000 (19:29 +0000)]
add local DNS recursor class

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years ago/etc/ferm is now also (kind of, almost) under puppet control
Stephen Gran [Tue, 23 Feb 2010 19:20:42 +0000 (19:20 +0000)]
/etc/ferm is now also (kind of, almost) under puppet control

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoferm.conf is now (kind of, almost) under puppet control
Stephen Gran [Tue, 23 Feb 2010 19:19:10 +0000 (19:19 +0000)]
ferm.conf is now (kind of, almost) under puppet control

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand name them usefully
Stephen Gran [Tue, 23 Feb 2010 19:11:19 +0000 (19:11 +0000)]
and name them usefully

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agouse v4 for iptables and v6 for ip6tables
Stephen Gran [Tue, 23 Feb 2010 19:10:37 +0000 (19:10 +0000)]
use v4 for iptables and v6 for ip6tables

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomake MS ports quiet
Stephen Gran [Tue, 23 Feb 2010 19:05:34 +0000 (19:05 +0000)]
make MS ports quiet

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd draghi as nagios host, as it needs to connect to nrpe
Stephen Gran [Tue, 23 Feb 2010 18:50:54 +0000 (18:50 +0000)]
add draghi as nagios host, as it needs to connect to nrpe

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agotry to make samhain quiet about ferm
Stephen Gran [Tue, 23 Feb 2010 18:31:49 +0000 (18:31 +0000)]
try to make samhain quiet about ferm

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agozobel!
Stephen Gran [Tue, 23 Feb 2010 18:31:37 +0000 (18:31 +0000)]
zobel!

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoaacraid stuff on pettersson
Peter Palfrader [Tue, 23 Feb 2010 00:55:19 +0000 (01:55 +0100)]
aacraid stuff on pettersson

14 years agoAdd pettersson
Peter Palfrader [Mon, 22 Feb 2010 21:14:48 +0000 (22:14 +0100)]
Add pettersson

14 years agoMerge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
Martin Zobel-Helas [Mon, 22 Feb 2010 09:27:34 +0000 (10:27 +0100)]
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agoadd zobel's IPs fro $DSA_IPS and $DSA_V6_IPS
Martin Zobel-Helas [Mon, 22 Feb 2010 09:27:00 +0000 (10:27 +0100)]
add zobel's IPs fro $DSA_IPS and $DSA_V6_IPS

14 years agoquiet down, you
Stephen Gran [Mon, 22 Feb 2010 08:55:56 +0000 (08:55 +0000)]
quiet down, you

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRevert "unrestrict geo2,3"
Stephen Gran [Mon, 22 Feb 2010 08:49:32 +0000 (08:49 +0000)]
Revert "unrestrict geo2,3"

This reverts commit 9dc4b5046bff9c6356ebe06fa3785b0cfceb2688.

14 years agoRevert "unrestrict geo2,3, take 2"
Stephen Gran [Mon, 22 Feb 2010 08:49:24 +0000 (08:49 +0000)]
Revert "unrestrict geo2,3, take 2"

This reverts commit 4502d26636291d26e439b42efc277970c263b5b2.

14 years agounrestrict geo2,3, take 2
Stephen Gran [Mon, 22 Feb 2010 08:48:15 +0000 (08:48 +0000)]
unrestrict geo2,3, take 2

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agounrestrict geo2,3
Stephen Gran [Mon, 22 Feb 2010 08:47:41 +0000 (08:47 +0000)]
unrestrict geo2,3

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agospot the typo
Stephen Gran [Mon, 22 Feb 2010 01:32:21 +0000 (01:32 +0000)]
spot the typo

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agorestricted ssh access to geo machines as well
Stephen Gran [Mon, 22 Feb 2010 01:26:58 +0000 (01:26 +0000)]
restricted ssh access to geo machines as well

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agooops
Stephen Gran [Mon, 22 Feb 2010 01:22:16 +0000 (01:22 +0000)]
oops

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd the rest of the geo hosts to ferm class
Stephen Gran [Mon, 22 Feb 2010 01:19:32 +0000 (01:19 +0000)]
add the rest of the geo hosts to ferm class

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomore down hosts
Stephen Gran [Mon, 22 Feb 2010 01:17:42 +0000 (01:17 +0000)]
more down hosts

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agologtest01 spends much of it's time down
Stephen Gran [Mon, 22 Feb 2010 01:14:13 +0000 (01:14 +0000)]
logtest01 spends much of it's time down

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agook, so now extractnodeinfo comes back with the value true, rather than the string...
Stephen Gran [Mon, 22 Feb 2010 01:08:50 +0000 (01:08 +0000)]
ok, so now extractnodeinfo comes back with the value true, rather than the string "true".  I wonder how long this has been silently broken

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRevert "test classes"
Stephen Gran [Mon, 22 Feb 2010 01:08:03 +0000 (01:08 +0000)]
Revert "test classes"

This reverts commit 9698ac16e7c372a59158f21f25aa2bbf8db0f020.

14 years agotest classes
Stephen Gran [Mon, 22 Feb 2010 00:35:02 +0000 (00:35 +0000)]
test classes

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 18:53:28 +0000 (19:53 +0100)]
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:
  nagios is also allowed to check if munin is listening
  typo
  will ferm do the right thing?
  Revert "will ferm do the right thing?"
  will ferm do the right thing?

14 years agosamosa->cimarosa
Peter Palfrader [Sun, 21 Feb 2010 18:53:21 +0000 (19:53 +0100)]
samosa->cimarosa

14 years agonagios is also allowed to check if munin is listening
Stephen Gran [Sun, 21 Feb 2010 16:51:41 +0000 (16:51 +0000)]
nagios is also allowed to check if munin is listening

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agotypo
Stephen Gran [Sun, 21 Feb 2010 16:50:16 +0000 (16:50 +0000)]
typo

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agowill ferm do the right thing?
Stephen Gran [Sun, 21 Feb 2010 16:49:32 +0000 (16:49 +0000)]
will ferm do the right thing?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRevert "will ferm do the right thing?"
Stephen Gran [Sun, 21 Feb 2010 16:48:28 +0000 (16:48 +0000)]
Revert "will ferm do the right thing?"

This reverts commit a47c22e58d6502bb314e9fca3814fae1cadc62e5.

14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:47:47 +0000 (16:47 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agowill ferm do the right thing?
Stephen Gran [Sun, 21 Feb 2010 16:47:42 +0000 (16:47 +0000)]
will ferm do the right thing?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoForward merkel:5441 to samosa:5441
Peter Palfrader [Sun, 21 Feb 2010 16:11:23 +0000 (17:11 +0100)]
Forward merkel:5441 to samosa:5441

14 years agoadd geo1
Stephen Gran [Sun, 21 Feb 2010 16:07:24 +0000 (16:07 +0000)]
add geo1

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:04:51 +0000 (16:04 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agouse new split v4/v6 defs in template
Stephen Gran [Sun, 21 Feb 2010 16:04:47 +0000 (16:04 +0000)]
use new split v4/v6 defs in template

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 16:04:32 +0000 (17:04 +0100)]
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:
  add draghi as dbmaster
  split nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the superset as well

14 years agoAnd support many forward ports from a single host
Peter Palfrader [Sun, 21 Feb 2010 16:04:04 +0000 (17:04 +0100)]
And support many forward ports from a single host

14 years agoadd draghi as dbmaster
Stephen Gran [Sun, 21 Feb 2010 16:03:08 +0000 (16:03 +0000)]
add draghi as dbmaster

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:01:44 +0000 (16:01 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agosplit nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the super...
Stephen Gran [Sun, 21 Feb 2010 16:01:41 +0000 (16:01 +0000)]
split nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the superset as well

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 15:57:20 +0000 (16:57 +0100)]
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:
  nagios is also allowed to connect to ssh
  anchor start of line
  template the munin master as well
  erb, I hate you
  reshuffle bind configuration