projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop old mekeel volumes at bm
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
cadc12e
..
e939261
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-19,85
+19,55
@@
Service {
}
node default {
}
node default {
- include site
- include munin
- include syslog-ng
- include sudo
- include ssh
- include debian-org
- include monit
- include ntp
- include ntpdate
- include ssl
- include motd
- include hardware
- include nagios::client
- include resolv
- include roles
- include unbound
+ # we really should rename this one
+ include deprecated
+ include base
- if $::hostname in [pasquini,tristano] {
- include ganeti2
- }
-
- if $::kernel == Linux {
- include linux
- if $::kvmdomain {
- include acpi
- }
- } elsif $::kernel == 'GNU/kFreeBSD' {
- include kfreebsd
- }
+ # this is magic: it will include whatever classes says we should
+ # include, based on the value of the "classes" array
+ hiera_include('classes')
- if $::mta == 'exim4' {
- if getfromhash($site::nodeinfo, 'heavy_exim') {
- include exim::mx
- } else {
- include exim
- }
- } elsif $::mta == 'postfix' {
- include postfix
- } else {
- include exim
- }
-
- if $::apache2 {
- include apache2
+ include roles::pubsub::client
+ class { 'roles::udldap::client':
+ ensure => absent
}
}
- if $::hostname in [ravel,senfl,orff,draghi,diamond] {
- include named::authoritative
- } elsif $::hostname in [geo1,geo2,geo3] {
- include named::geodns
+ if getfromhash($deprecated::nodeinfo, 'ganeti') {
+ include ganeti2
}
}
- if $::hostname in [diabelli,nono,spohr] {
- include dacs
+ if $::kernel == 'Linux' {
+ include linux
+ include acpi
}
}
- if $::hostname in [b
eethoven,duarte,spohr,stabile
] {
- include nfs
-
server
+ if $::hostname in [b
uxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius
] {
+ include nfs
_
server
}
if $::brokenhosts {
include hosts
}
}
if $::brokenhosts {
include hosts
}
- if $::
portforwarder_user_exists
{
- include
portforwarder
+ if $::
samhain
{
+ include
samhain
}
}
- include samhain
+ if $::hostname in [geo3,wieck] {
+ include debian_org::radvd
+ }
- if $::
hostname in [chopin,geo3,soler,wieck]
{
- include debian-org::radvd
+ if $::
spamd
{
+ munin::check { 'spamassassin': }
}
}
- if
($::postgres84 or $::postgres90)
{
- include
postgres
+ if
$::hostname == 'pkgmirror-csail'
{
+ include
varnish_pkgmirror
}
}
- if $::spamd {
- munin::check { 'spamassassin': }
+ if $::apache2 {
+ if ! defined(Class['apache2']) {
+ fail('We have apache installed but no role pulled it in.')
+ }
}
}
}
}