projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
historical_master -> hiera role
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
d51a9bc
..
adc2795
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-29,30
+29,11
@@
class roles {
if has_role('debian_mirror') {
include roles::debian_mirror
}
if has_role('debian_mirror') {
include roles::debian_mirror
}
- if has_role('ftp_master') {
- include roles::ftp_master
- include roles::dakmaster
- include roles::signing
- }
- #
- # security.debian.org
- if has_role('security_master') {
- include roles::security_master
- include roles::dakmaster
- }
if has_role('security_mirror') {
include roles::security_mirror
}
if has_role('security_mirror') {
include roles::security_mirror
}
- if has_role('syncproxy') {
- include roles::syncproxy
- }
-
- if has_role('dns_primary') {
- include roles::dns_primary
- }
-
if has_role('postgres_backup_server') {
include postgres::backup_server
}
if has_role('postgres_backup_server') {
include postgres::backup_server
}
@@
-61,13
+42,6
@@
class roles {
include roles::snapshot
}
include roles::snapshot
}
- if has_role('ports_master') {
- include roles::ports_master
- }
-
- if has_role('onionbalance') {
- include onion::balance
- }
if has_role('bgp') {
include roles::bgp
}
if has_role('bgp') {
include roles::bgp
}