projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add piu-slave-ubc-01
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
091e769
..
098b96a
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-26,8
+26,7
@@
node default {
include ssh
include debian-org
include monit
include ssh
include debian-org
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,7
@@
node default {
include dsa_lvm
include grub
include multipath
include dsa_lvm
include grub
include multipath
+ include popcon
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
@@
-89,19
+89,13
@@
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 [diabelli,nono,tchaikovsky] {
- # include dacs
- #}
-
if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
include nfs-server
}
if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
include nfs-server
}
@@
-130,10
+124,7
@@
node default {
munin::check { 'spamassassin': }
}
munin::check { 'spamassassin': }
}
- if $::hoster {
- if $::hoster in [ynic] {
- include lldp
- }
+ if $::hostname == 'pkgmirror-csail' {
+ include varnish
}
}
}
}
-