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.d.o role
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
75bac4c
..
1935926
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-54,7
+54,7
@@
node default {
} else {
include exim
}
} else {
include exim
}
- } els
if $::hostname == 'bendel'
{
+ } els
e
{
include postfix
}
include postfix
}
@@
-94,6
+94,14
@@
node default {
include roles::backports_mirror
}
include roles::backports_mirror
}
+ if getfromhash($site::nodeinfo, 'ftp.d.o') {
+ include roles::ftp
+ }
+
+ 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
}
@@
-144,7
+152,7
@@
node default {
munin::check { 'spamassassin': }
}
munin::check { 'spamassassin': }
}
- if $::hostname in [chopin,franck,
kassia,klecker,morricone,ravel,bizet
] {
+ if $::hostname in [chopin,franck,
ravel
] {
include vsftpd
}
}
include vsftpd
}
}