projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
0d5176e
861c0b1
)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
author
Stephen Gran
<steve@lobefin.net>
Sat, 1 Aug 2009 14:03:21 +0000
(15:03 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Sat, 1 Aug 2009 14:03:21 +0000
(15:03 +0100)
1
2
manifests/site.pp
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
manifests/site.pp
index
70b6722
,
a4d13e6
..
8331d50
---
1
/
manifests/site.pp
---
2
/
manifests/site.pp
+++ b/
manifests/site.pp
@@@
-16,7
-16,6
+16,7
@@@
Exec
node default {
include munin-node
include sudo
+ include ssh
include debian-org
include monit
include apt-keys
@@@
-60,6
-59,11
+60,11
@@@
"true": { include buildd }
default: { }
}
+ case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+ "true": { include apache2::security_mirror }
+ default: { }
+ }
+
# maybe wait for rietz to be upgraded to lenny
# case $hostname {