projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roles: drop redundant configuration
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
9caaa5b
..
5ec93d1
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-30,7
+30,13
@@
class roles {
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'porterbox') {
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'porterbox') {
- include porterbox
+ class {'porterbox':
+ ensure => present,
+ }
+ } else {
+ class {'porterbox':
+ ensure => absent,
+ }
}
if has_role('bugs_mirror') {
}
if has_role('bugs_mirror') {
@@
-75,6
+81,12
@@
class roles {
include roles::git_master
}
include roles::git_master
}
+ if has_role('people') {
+ ssl::service { 'people.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if has_role('security_master') {
include roles::security_master
include roles::dakmaster
if has_role('security_master') {
include roles::security_master
include roles::dakmaster
@@
-162,6
+174,10
@@
class roles {
include roles::buildd_master
}
include roles::buildd_master
}
+ if has_role('buildd_ports_master') {
+ include roles::buildd_ports_master
+ }
+
if has_role('piuparts') {
include roles::piuparts
}
if has_role('piuparts') {
include roles::piuparts
}