projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maybe?
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
192c546
..
d8f1b09
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-1,5
+1,5
@@
Package {
Package {
- require =>
[ Exec["apt-get update"], File["/etc/apt/apt.conf.d/local-recommends"]
]
+ require =>
File["/etc/apt/apt.conf.d/local-recommends"
]
}
File {
}
File {
@@
-14,6
+14,8
@@
Exec {
}
node default {
}
node default {
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
include munin-node
include sudo
include ssh
include munin-node
include sudo
include ssh
@@
-21,8
+23,6
@@
node default {
include monit
include apt-keys
include monit
include apt-keys
- $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
include motd
include samhain
include motd
include samhain
@@
-75,8
+75,13
@@
node default {
case $hostname {
geo1,geo2,geo3:
case $hostname {
geo1,geo2,geo3:
- { include geodns }
- default: {}
+ {
+ include geodns
+ include ntp::server
+ }
+ default: {
+ include ntp::client
+ }
}
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }