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 the certregen::client class to all nodes
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3681c36
..
6b8be82
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,14
@@
node default {
include dsa_lvm
include grub
include multipath
include dsa_lvm
include grub
include multipath
+ include popcon
+ include portforwarder
+ include postgres
+ include haveged
+ include huge_mem
+ include tcp_bbr
+ include certregen::client
+
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
@@
-49,31
+56,13
@@
node default {
}
}
}
}
- if
$::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02]
{
+ if
getfromhash($site::nodeinfo, 'ganeti')
{
include ganeti2
}
include ganeti2
}
- if $::hostname == 'dinis' {
- include bacula::director
- } else {
- package { 'bacula-console':
- ensure => purged;
- }
-
- file { '/etc/bacula/bconsole.conf':
- ensure => absent;
- }
- }
-
- if $::hostname == 'storace' {
- include bacula::storage
- }
-
- if $::kernel == Linux {
+ if $::kernel == 'Linux' {
include linux
include acpi
include linux
include acpi
- } elsif $::kernel == 'GNU/kFreeBSD' {
- include kfreebsd
}
if $::mta == 'exim4' {
}
if $::mta == 'exim4' {
@@
-89,51
+78,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 [diabelli,nono,tchaikovsky] {
- # include dacs
- #}
-
- if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04] {
- include nfs-server
+ if $::hostname in [buxtehude,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
}
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_pkgmirror
}
}
}
}
-