projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nagiosmaster -> hiera role; bind acls still not converted
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
eff82e7
..
fb571c5
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-7,15
+7,6
@@
# include roles
#
class roles {
# include roles
#
class roles {
- if has_role('nagiosmaster') {
- include nagios::server
- }
-
- # ftp.debian.org and its ecosystem
- if has_role('debian_mirror') {
- include roles::debian_mirror
- }
-
if has_role('security_mirror') {
include roles::security_mirror
}
if has_role('security_mirror') {
include roles::security_mirror
}
@@
-28,10
+19,6
@@
class roles {
include roles::snapshot
}
include roles::snapshot
}
- if has_role('bgp') {
- include roles::bgp
- }
-
if has_role('postgresql_server') {
include postgres::backup_source
}
if has_role('postgresql_server') {
include postgres::backup_source
}