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 ftp_upload role
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
deeccd9
..
bb8f2c2
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-1,10
+1,8
@@
Package {
Package {
- noop => true,
require => File['/etc/apt/apt.conf.d/local-recommends']
}
File {
require => File['/etc/apt/apt.conf.d/local-recommends']
}
File {
- noop => true,
owner => root,
group => root,
mode => '0444',
owner => root,
group => root,
mode => '0444',
@@
-12,12
+10,10
@@
File {
}
Exec {
}
Exec {
- noop => true,
path => '/usr/bin:/usr/sbin:/bin:/sbin'
}
Service {
path => '/usr/bin:/usr/sbin:/bin:/sbin'
}
Service {
- noop => true,
hasrestart => true,
hasstatus => true,
}
hasrestart => true,
hasstatus => true,
}
@@
-38,7
+34,13
@@
node default {
include nagios::client
include resolv
include nagios::client
include resolv
- if $::hostname in [finzi,fano,fasch,field] {
+ if $::hostname in [pasquini,tristano] {
+ include ganeti2
+ }
+
+ if $::kernel == Linux {
+ include linux
+ } elsif $::kernel == 'GNU/kFreeBSD' {
include kfreebsd
}
include kfreebsd
}
@@
-52,6
+54,8
@@
node default {
} else {
include exim
}
} else {
include exim
}
+ } else {
+ include postfix
}
if $::lsbdistcodename != 'lenny' {
}
if $::lsbdistcodename != 'lenny' {
@@
-90,6
+94,18
@@
node default {
include roles::backports_mirror
}
include roles::backports_mirror
}
+ if getfromhash($site::nodeinfo, 'ftp.d.o') {
+ include roles::ftp
+ }
+
+ if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+ include roles::ftp_upload
+ }
+
+ if $::hostname in [bizet,morricone] {
+ include roles::backports_master
+ }
+
if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
include roles::ftp-upcoming_mirror
}
if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
include roles::ftp-upcoming_mirror
}
@@
-110,12
+126,6
@@
node default {
include named::recursor
}
include named::recursor
}
- if $::kernel == 'Linux' {
- include ferm
- include ferm::per-host
- include entropykey
- }
-
if $::hostname in [diabelli,nono,spohr] {
include dacs
}
if $::hostname in [diabelli,nono,spohr] {
include dacs
}
@@
-146,13
+156,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,ravel] {
+ include vsftpd
}
}
}
}