projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deploy db.d.o cert
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
fd6d304
..
8500597
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-1,6
+1,8
@@
class roles {
class roles {
- if getfromhash($site::nodeinfo, 'puppetmaster') {
+ $roles = hiera('roles')
+
+ if $::fqdn in $roles['puppetmaster'] {
include puppetmaster
}
include puppetmaster
}
@@
-88,10
+90,22
@@
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
}
+ if $::hostname in [vento] {
+ ssl::service { 'vote.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if $::hostname in [soler] {
ssl::service { 'security-tracker.debian.org':
notify => Service['apache2'],
if $::hostname in [soler] {
ssl::service { 'security-tracker.debian.org':
notify => Service['apache2'],
@@
-104,11
+118,29
@@
class roles {
}
}
}
}
+ if $::hostname in [reger] {
+ ssl::service { 'rt.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
+ if $::hostname in [diabelli] {
+ ssl::service { 'sso.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if $::hostname in [ullmann] {
ssl::service { 'udd.debian.org':
notify => Service['apache2'],
}
}
if $::hostname in [ullmann] {
ssl::service { 'udd.debian.org':
notify => Service['apache2'],
}
}
+
+ if $::hostname in [wuiet] {
+ ssl::service { 'buildd.debian.org':
+ notify => Service['apache2'],
+ }
+ }
if $::hostname in [pejacevic] {
ssl::service { 'piuparts.debian.org':
if $::hostname in [pejacevic] {
ssl::service { 'piuparts.debian.org':