projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop using virtual resources for ferm::rule
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
1837f94
..
65c23bc
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-7,11
+7,6
@@
# include roles
#
class roles {
# include roles
#
class roles {
-
- if has_role('puppetmaster') {
- include puppetmaster
- }
-
if has_role('muninmaster') {
include munin::master
}
if has_role('muninmaster') {
include munin::master
}
@@
-39,7
+34,7
@@
class roles {
notify => Exec['service apache2 reload'],
key => true,
}
notify => Exec['service apache2 reload'],
key => true,
}
-
@
ferm::rule { 'dsa-bugs-abusers':
+ ferm::rule { 'dsa-bugs-abusers':
prio => "005",
rule => "saddr (220.243.135/24 220.243.136/24) DROP",
}
prio => "005",
rule => "saddr (220.243.135/24 220.243.136/24) DROP",
}
@@
-158,11
+153,11
@@
class roles {
}
if has_role('dns_primary') {
}
if has_role('dns_primary') {
- include
named::
primary
+ include
roles::dns_
primary
}
if has_role('dns_geo') {
}
if has_role('dns_geo') {
- include
named::
geodns
+ include
roles::dns_
geodns
}
if has_role('weblog_destination') {
}
if has_role('weblog_destination') {
@@
-201,10
+196,6
@@
class roles {
include roles::tracker
}
include roles::tracker
}
- if has_role('buildd_master') {
- include roles::buildd_master
- }
-
if has_role('piuparts') {
include roles::piuparts
}
if has_role('piuparts') {
include roles::piuparts
}
@@
-394,8
+385,4
@@
class roles {
if has_role('anonscm') {
include roles::anonscm
}
if has_role('anonscm') {
include roles::anonscm
}
-
- if has_role('loghost') {
- include syslog_ng::loghost
- }
}
}