projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
d58296c
)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
author
Peter Palfrader
<peter@palfrader.org>
Sun, 31 Jan 2010 21:40:33 +0000
(22:40 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Sun, 31 Jan 2010 21:40:33 +0000
(22:40 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
add aacraid fact
add alkman.debian.org
add purcell to mailout
modules/samhain/templates/samhainrc.erb
patch
|
blob
|
history
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
005b187
..
d72a4d2
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-371,7
+371,7
@@
when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
when /(senfl|ravel|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind
file=/etc/bind/named.conf.debian-zones"
-when /(zandonai|biber).debian.org/: extrafiles="dir=3/etc/lvm"
+when /(zandonai|biber
|alkman
).debian.org/: extrafiles="dir=3/etc/lvm"
end
extrafiles
%>