projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try an rsync class
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
137cd75
..
2bdae0d
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-16,7
+16,7
@@
class roles {
include buildd
}
include buildd
}
- if
$::hostname in [chopin,franck,morricone,bizet]
{
+ if
getfromhash($site::nodeinfo, 'ftp_master')
{
include roles::dakmaster
}
include roles::dakmaster
}
@@
-40,8
+40,14
@@
class roles {
include roles::ftp_upload
}
include roles::ftp_upload
}
- if
$::hostname in [bizet,morricone]
{
+ if
getfromhash($site::nodeinfo, 'backports_master')
{
include roles::backports_master
include roles::backports_master
+ include roles::dakmaster
+ }
+
+ if getfromhash($site::nodeinfo, 'security_master') {
+ include roles::security_master
+ include roles::dakmaster
}
if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
}
if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {