projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
target is preferred
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
a55107b
..
54ed652
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-3,10
+3,10
@@
Package {
}
File {
}
File {
- owner
=> root,
- group
=> root,
- mode
=> '0444',
- ensure
=> file,
+ owner => root,
+ group => root,
+ mode => '0444',
+ ensure => file,
}
Exec {
}
Exec {
@@
-26,7
+26,6
@@
node default {
include ssh
include debian-org
include monit
include ssh
include debian-org
include monit
- include apt-keys
include ntp
include ntpdate
include ssl
include ntp
include ntpdate
include ssl
@@
-35,6
+34,10
@@
node default {
include nagios::client
include resolv
include nagios::client
include resolv
+ if $::hostname in [pasquini,tristano] {
+ include ganeti2
+ }
+
if $::hostname in [finzi,fano,fasch,field] {
include kfreebsd
}
if $::hostname in [finzi,fano,fasch,field] {
include kfreebsd
}
@@
-49,6
+52,8
@@
node default {
} else {
include exim
}
} else {
include exim
}
+ } elsif $::hostname == 'bendel' {
+ include postfix
}
if $::lsbdistcodename != 'lenny' {
}
if $::lsbdistcodename != 'lenny' {
@@
-143,13
+148,7
@@
node default {
munin::check { 'spamassassin': }
}
munin::check { 'spamassassin': }
}
- if $::vsftpd {
- package { 'logtail':
- ensure => installed
- }
- munin::check { 'vsftpd': }
- munin::check { 'ps_vsftpd':
- script => 'ps_'
- }
+ if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
+ include vsftpd
}
}
}
}