projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
9b3aa43
..
97e962a
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-21,13
+21,12
@@
Service {
node default {
include site
include munin
node default {
include site
include munin
- include syslog
-
ng
+ include syslog
_
ng
include sudo
include ssh
include sudo
include ssh
- include debian
-
org
+ include debian
_
org
include monit
include monit
- include ntp
- include ntpdate
+ include time
include ssl
include hardware
include nagios::client
include ssl
include hardware
include nagios::client
@@
-40,6
+39,10
@@
node default {
include dsa_lvm
include grub
include multipath
include dsa_lvm
include grub
include multipath
+ include popcon
+ include portforwarder
+ include postgres
+
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
@@
-69,7
+72,7
@@
node default {
include bacula::storage
}
include bacula::storage
}
- if $::kernel ==
Linux
{
+ if $::kernel ==
'Linux'
{
include linux
include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
include linux
include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
@@
-89,47
+92,34
@@
node default {
}
if $::apache2 {
}
if $::apache2 {
- if !($::hostname in [oyens]) {
- include apache2
- }
+ include apache2
}
if $::hostname in [geo1,geo2,geo3] {
include named::geodns
}
}
if $::hostname in [geo1,geo2,geo3] {
include named::geodns
}
- if $::hostname in [buxtehude,
glinka,
milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
- include nfs
-
server
+ if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+ include nfs
_
server
}
if $::brokenhosts {
include hosts
}
}
if $::brokenhosts {
include hosts
}
- if $::portforwarder_user_exists {
- include portforwarder
- }
-
if $::samhain {
include samhain
}
if $::hostname in [geo3,wieck] {
if $::samhain {
include samhain
}
if $::hostname in [geo3,wieck] {
- include debian-org::radvd
- }
-
- if ($::postgres) {
- include postgres
+ include debian_org::radvd
}
if $::spamd {
munin::check { 'spamassassin': }
}
}
if $::spamd {
munin::check { 'spamassassin': }
}
- if $::hoster {
- if $::hoster in [ynic] {
- include lldp
- }
+ if $::hostname == 'pkgmirror-csail' {
+ include varnish
}
}
}
}
-