projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change /org to /srv in security rsync.conf
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
218452a
..
a3c219c
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-29,15
+29,26
@@
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 bacula::client
include unbound
include bacula::client
+ include autofs
+ include lvm
+ include multipath
+ if $::lsbdistcodename == squeeze {
+ include roles::udldap::client
+ } else {
+ include roles::pubsub::client
+ class { 'roles::udldap::client':
+ ensure => absent
+ }
+ }
- if $::hostname in [pasquini,tristano,bertali,boito,
byrd
] {
+ 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
] {
include ganeti2
}
include ganeti2
}
@@
-53,7
+64,7
@@
node default {
}
}
}
}
- if $::hostname == 'b
eethoven
' {
+ if $::hostname == 'b
ackuphost
' {
include bacula::storage
}
include bacula::storage
}
@@
-82,17
+93,15
@@
node default {
include apache2
}
include apache2
}
- if $::hostname in [ravel,senfl,orff,draghi,diamond] {
- include named::authoritative
- } elsif $::hostname in [geo1,geo2,geo3] {
+ if $::hostname in [geo1,geo2,geo3] {
include named::geodns
}
include named::geodns
}
-
if $::hostname in [diabelli,nono,spohr
] {
-
include dacs
- }
+
#if $::hostname in [diabelli,nono,tchaikovsky
] {
+
#
include dacs
+
#
}
- if $::hostname in [
beethoven,spohr,stabile,beach
] {
+ if $::hostname in [
stabile,beach,glinka,milanollo,rautavaara,lw01,lw02,lw03,lw04
] {
include nfs-server
}
include nfs-server
}
@@
-104,21
+113,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
}
include postgres
}
- if $::hostname in ['berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
- @@bacula::node { $::fqdn: }
- }
-
if $::spamd {
munin::check { 'spamassassin': }
}
if $::spamd {
munin::check { 'spamassassin': }
}
+
+ if $::hoster {
+ if $::hoster in [ynic] {
+ include lldp
+ }
+ }
}
}