projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove postgres things if we do not have postgresql
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
178fc2d
..
8e72e7d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-21,10
+21,10
@@
Service {
node default {
include site
include munin
node default {
include site
include munin
- include syslog
-
ng
+ include syslog
_
ng
include sudo
include ssh
include sudo
include ssh
- include debian
-
org
+ include debian
_
org
include monit
include time
include ssl
include monit
include time
include ssl
@@
-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 {
@@
-69,7
+72,7
@@
node default {
include bacula::storage
}
include bacula::storage
}
- if $::kernel ==
Linux
{
+ if $::kernel ==
'Linux'
{
include linux
include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
include linux
include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
@@
-104,20
+107,12
@@
node default {
include hosts
}
include hosts
}
- if $::portforwarder_user_exists {
- include portforwarder
- }
-
if $::samhain {
include samhain
}
if $::hostname in [geo3,wieck] {
if $::samhain {
include samhain
}
if $::hostname in [geo3,wieck] {
- include debian-org::radvd
- }
-
- if ($::postgres) {
- include postgres
+ include debian_org::radvd
}
if $::spamd {
}
if $::spamd {