projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't fail if no local exclusion file exists
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
aaeacee
..
4dcdb38
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-16,6
+16,10
@@
class roles {
include buildd
}
include buildd
}
+ if getfromhash($site::nodeinfo, 'porterbox') {
+ include porterbox
+ }
+
if getfromhash($site::nodeinfo, 'bugs_mirror') {
include roles::bugs_mirror
}
if getfromhash($site::nodeinfo, 'bugs_mirror') {
include roles::bugs_mirror
}
@@
-33,10
+37,6
@@
class roles {
include roles::www_mirror
}
include roles::www_mirror
}
- if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
- include roles::backports_mirror
- }
-
if getfromhash($site::nodeinfo, 'ftp.d.o') {
include roles::ftp
}
if getfromhash($site::nodeinfo, 'ftp.d.o') {
include roles::ftp
}
@@
-45,11
+45,6
@@
class roles {
include roles::ftp_upload
}
include roles::ftp_upload
}
- if getfromhash($site::nodeinfo, '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, 'security_master') {
include roles::security_master
include roles::dakmaster
@@
-63,8
+58,12
@@
class roles {
include roles::keyring
}
include roles::keyring
}
- if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
- include roles::ftp-upcoming_mirror
+ if getfromhash($site::nodeinfo, 'wiki') {
+ include roles::wiki
+ }
+
+ if getfromhash($site::nodeinfo, 'syncproxy') {
+ include roles::syncproxy
}
if getfromhash($site::nodeinfo, 'static_master') {
}
if getfromhash($site::nodeinfo, 'static_master') {
@@
-76,4
+75,16
@@
class roles {
} elsif getfromhash($site::nodeinfo, 'static_source') {
include roles::static_source
}
} elsif getfromhash($site::nodeinfo, 'static_source') {
include roles::static_source
}
+
+ if getfromhash($site::nodeinfo, 'weblog_provider') {
+ include roles::weblog_provider
+ }
+
+ if getfromhash($site::nodeinfo, 'mailrelay') {
+ include roles::mailrelay
+ }
+
+ if $::hostname in [ravel] {
+ include roles::weblog_destination
+ }
}
}