projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split up mail roles
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
ac27234
..
e939261
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-1,84
+1,73
@@
Package {
Package {
-
require => File["/etc/apt/apt.conf.d/local-recommends"
]
+
require => File['/etc/apt/apt.conf.d/local-recommends'
]
}
File {
}
File {
-
owner
=> root,
-
group
=> root,
-
mode => 444
,
-
ensure
=> file,
+
owner
=> root,
+
group
=> root,
+
mode => '0444'
,
+
ensure
=> file,
}
Exec {
}
Exec {
- path => "/usr/bin:/usr/sbin:/bin:/sbin"
+ path => '/usr/bin:/usr/sbin:/bin:/sbin'
+}
+
+Service {
+ hasrestart => true,
+ hasstatus => true,
}
node default {
}
node default {
- $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
- $hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
- notice("hoster for ${fqdn} is ${hoster}")
+ # 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')
- $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
- $mxinfo = allnodeinfo("mXRecord")
+ include roles::pubsub::client
+ class { 'roles::udldap::client':
+ ensure => absent
+ }
- include munin-node
- include sudo
- include ssh
- include debian-org
- include monit
- include apt-keys
- include ntp
+ if getfromhash($deprecated::nodeinfo, 'ganeti') {
+ include ganeti2
+ }
- include motd
- include samhain
+ if $::kernel == 'Linux' {
+ include linux
+ include acpi
+ }
-
case $smartarraycontroller
{
- "true": { include debian-proliant }
- }
+
if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius]
{
+ include nfs_server
+
}
- case $mta {
- "exim4": {
- case extractnodeinfo($nodeinfo, 'heavy_exim') {
- "true": { include exim::mx }
- default: { include exim }
- }
- }
- }
+ if $::brokenhosts {
+ include hosts
+ }
- case $hostname {
- spohr: {
- include nagios::server
- }
- default: {
- include nagios::client
+ if $::samhain {
+ include samhain
}
}
- }
- case $apache2 {
- "true": {
- case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
- "true": { include apache2::security_mirror }
- default: { include apache2 }
- }
- }
- }
+ if $::hostname in [geo3,wieck] {
+ include debian_org::radvd
+ }
-
case extractnodeinfo($nodeinfo, 'buildd')
{
-
"true": { include buildd
}
- }
+
if $::spamd
{
+
munin::check { 'spamassassin':
}
+
}
-# maybe wait for rietz to be upgraded to lenny
- case $hostname {
- rietz,raff,klecker: { include named::secondary }
- }
+ if $::hostname == 'pkgmirror-csail' {
+ include varnish_pkgmirror
+ }
- case $hostname {
- geo1,geo2,geo3: { include named::geodns }
- }
- case $brokenhosts {
- "true": { include hosts }
- }
- case $hoster {
- "ubcece", "darmstadt": { include resolv }
- }
+ if $::apache2 {
+ if ! defined(Class['apache2']) {
+ fail('We have apache installed but no role pulled it in.')
+ }
+ }
}
}