projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
06719f4
..
af7c23d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-14,14
+14,15
@@
Exec {
}
node default {
}
node default {
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
include munin-node
include sudo
include munin-node
include sudo
+ include ssh
include debian-org
include monit
include apt-keys
include debian-org
include monit
include apt-keys
- $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
include motd
include samhain
include motd
include samhain
@@
-60,7
+61,7
@@
node default {
default: { }
}
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
default: { }
}
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
- "true": { include security_mirror }
+ "true": { include
apache2::
security_mirror }
default: { }
}
default: { }
}