projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
busoni is static-mirror/weblog-provider
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
1db00d8
..
8e4a77a
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-29,19
+29,36
@@
node default {
include ntp
include ntpdate
include ssl
include ntp
include ntpdate
include ssl
- include motd
include hardware
include nagios::client
include resolv
include roles
include hardware
include nagios::client
include resolv
include roles
+ include motd
include unbound
include unbound
+ include bacula::client
+ include autofs
+ include lvm
+ include multipath
- if $::hostname in [pasquini,tristano] {
+ if $::hostname in [pasquini,tristano
,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14
] {
include ganeti2
}
include ganeti2
}
+
if $::hostname == 'dinis' {
if $::hostname == 'dinis' {
- include bacula-director
+ include bacula::director
+ } else {
+ package { 'bacula-console':
+ ensure => purged;
+ }
+
+ file { '/etc/bacula/bconsole.conf':
+ ensure => absent;
+ }
+ }
+
+ if $::hostname == 'beethoven' {
+ include bacula::storage
}
if $::kernel == Linux {
}
if $::kernel == Linux {
@@
-69,7
+86,7
@@
node default {
include apache2
}
include apache2
}
- if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+ if $::hostname in [ravel,senfl,orff,draghi,diamond
,rietz
] {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
@@
-79,10
+96,14
@@
node default {
include dacs
}
include dacs
}
- if $::hostname in [beethoven,
duarte,spohr,stabile
] {
+ if $::hostname in [beethoven,
spohr,stabile,beach,glinka,milanollo
] {
include nfs-server
}
include nfs-server
}
+ if $::hostname == 'vieuxtemps' {
+ include varnish
+ }
+
if $::brokenhosts {
include hosts
}
if $::brokenhosts {
include hosts
}
@@
-91,17
+112,25
@@
node default {
include portforwarder
}
include portforwarder
}
- include samhain
+ if $::samhain {
+ include samhain
+ }
if $::hostname in [chopin,geo3,soler,wieck] {
include debian-org::radvd
}
if $::hostname in [chopin,geo3,soler,wieck] {
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
+ }
+ }
}
}