projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new ssh key
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
a4a6cf0
..
d534068
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-58,6
+58,10
@@
class roles {
include roles::keyring
}
include roles::keyring
}
+ if getfromhash($site::nodeinfo, 'wiki') {
+ include roles::wiki
+ }
+
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
}
@@
-75,6
+79,11
@@
class roles {
if getfromhash($site::nodeinfo, 'weblog_provider') {
include roles::weblog_provider
}
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
}
if $::hostname in [ravel] {
include roles::weblog_destination
}