projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace/quoting: modules/exim/manifests/* (make lint happy)
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
fefab3f
..
7d4addb
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-49,10
+49,6
@@
class roles {
include roles::syncproxy
}
include roles::syncproxy
}
- if has_role('mailrelay') {
- include roles::mailrelay
- }
-
if has_role('dns_primary') {
include roles::dns_primary
}
if has_role('dns_primary') {
include roles::dns_primary
}
@@
-61,10
+57,6
@@
class roles {
include roles::dns_geodns
}
include roles::dns_geodns
}
- if has_role('rtmaster') {
- include roles::rtmaster
- }
-
if has_role('postgres_backup_server') {
include postgres::backup_server
}
if has_role('postgres_backup_server') {
include postgres::backup_server
}
@@
-78,10
+70,6
@@
class roles {
include roles::snapshot
}
include roles::snapshot
}
- if has_role('snapshot_web') {
- include roles::snapshot_web
- }
-
if has_role('ports_master') {
include roles::ports_master
}
if has_role('ports_master') {
include roles::ports_master
}
@@
-100,8
+88,4
@@
class roles {
if $::keyring_debian_org_mirror {
include roles::keyring_debian_org_mirror
}
if $::keyring_debian_org_mirror {
include roles::keyring_debian_org_mirror
}
-
- if has_role('popcon') {
- include roles::popcon
- }
}
}