projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dsa.d.o cert on static mirrors
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
3857240
..
8500597
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-1,6
+1,8
@@
class roles {
class roles {
- if $::hostname in hiera('roles::puppetmaster') {
+ $roles = hiera('roles')
+
+ if $::fqdn in $roles['puppetmaster'] {
include puppetmaster
}
include puppetmaster
}
@@
-88,6
+90,12
@@
class roles {
include roles::pubsub
}
include roles::pubsub
}
+ if getfromhash($site::nodeinfo, 'dbmaster') {
+ ssl::service { 'db.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if $::hostname in [ravel] {
include roles::weblog_destination
}
if $::hostname in [ravel] {
include roles::weblog_destination
}