projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename nfs-server to nfs_server
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
28a443c
..
97e962a
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-40,6
+40,9
@@
node default {
include grub
include multipath
include popcon
include grub
include multipath
include popcon
+ include portforwarder
+ include postgres
+
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
@@
-97,17
+100,13
@@
node default {
}
if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
}
if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
- include nfs
-
server
+ include nfs
_
server
}
if $::brokenhosts {
include hosts
}
}
if $::brokenhosts {
include hosts
}
- if $::portforwarder_user_exists {
- include portforwarder
- }
-
if $::samhain {
include samhain
}
if $::samhain {
include samhain
}
@@
-116,10
+115,6
@@
node default {
include debian_org::radvd
}
include debian_org::radvd
}
- if ($::postgres) {
- include postgres
- }
-
if $::spamd {
munin::check { 'spamassassin': }
}
if $::spamd {
munin::check { 'spamassassin': }
}