projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix coccia volumes at bm with OLD-
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
2933d23
..
ba5b9a1
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-19,40
+19,20
@@
Service {
}
node default {
}
node default {
- include site
- include munin
- include syslog_ng
- include sudo
- include ssh
- include debian_org
- include monit
- include time
- include ssl
- include hardware
- include nagios::client
- include resolv
- include roles
- include motd
- include unbound
- include bacula::client
- include autofs
- include dsa_lvm
- include grub
- include multipath
- include popcon
- include portforwarder
- include postgres
- include haveged
- include huge_mem
- include tcp_bbr
- include certregen::client
+ # we really should rename this one
+ include deprecated
+ include base
+
+ # this is magic: it will include whatever classes says we should
+ # include, based on the value of the "classes" array
+ hiera_include('classes')
include roles::pubsub::client
class { 'roles::udldap::client':
ensure => absent
}
include roles::pubsub::client
class { 'roles::udldap::client':
ensure => absent
}
- if getfromhash($
site
::nodeinfo, 'ganeti') {
+ if getfromhash($
deprecated
::nodeinfo, 'ganeti') {
include ganeti2
}
include ganeti2
}
@@
-61,26
+41,6
@@
node default {
include acpi
}
include acpi
}
- 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
- }
-
- if $::hostname in [geo1,geo2,geo3] {
- include named::geodns
- }
-
if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
include nfs_server
}
if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
include nfs_server
}
@@
-93,10
+53,6
@@
node default {
include samhain
}
include samhain
}
- if $::hostname in [geo3,wieck] {
- include debian_org::radvd
- }
-
if $::spamd {
munin::check { 'spamassassin': }
}
if $::spamd {
munin::check { 'spamassassin': }
}
@@
-104,4
+60,10
@@
node default {
if $::hostname == 'pkgmirror-csail' {
include varnish_pkgmirror
}
if $::hostname == 'pkgmirror-csail' {
include varnish_pkgmirror
}
+
+ if $::apache2 {
+ if ! defined(Class['apache2']) {
+ fail('We have apache installed but no role pulled it in.')
+ }
+ }
}
}