projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cut down on log entries
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
a504ecb
..
bdbdb28
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-35,18
+35,22
@@
node default {
include resolv
include roles
include unbound
include resolv
include roles
include unbound
+ include bacula::client
- if $::hostname in [pasquini,tristano,bertali,boito] {
+ if $::hostname in [pasquini,tristano,bertali,boito
,byrd,clementi
] {
include ganeti2
}
if $::hostname == 'dinis' {
include bacula::director
include ganeti2
}
if $::hostname == 'dinis' {
include bacula::director
- }
+ } else {
+ package { 'bacula-console':
+ ensure => purged;
+ }
- if $::hostname in [berlioz, biber, draghi] {
- include bacula::client
-
@@bacula::node { $::fqdn:
}
+ file { '/etc/bacula/bconsole.conf':
+ ensure => absent;
+ }
}
if $::hostname == 'beethoven' {
}
if $::hostname == 'beethoven' {
@@
-88,7
+92,7
@@
node default {
include dacs
}
include dacs
}
- if $::hostname in [beethoven,
duarte,
spohr,stabile,beach] {
+ if $::hostname in [beethoven,spohr,stabile,beach] {
include nfs-server
}
include nfs-server
}
@@
-106,11
+110,17
@@
node default {
include debian-org::radvd
}
include debian-org::radvd
}
- if ($::postgres
84 or $::postgres90
) {
+ if ($::postgres) {
include postgres
}
if $::spamd {
munin::check { 'spamassassin': }
}
include postgres
}
if $::spamd {
munin::check { 'spamassassin': }
}
+
+ if $::hoster {
+ if $::hoster in [ynic] {
+ include lldp
+ }
+ }
}
}