projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the pkglist fact. It's a) unused and b) slightly buggy
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
8bc6aa5
..
dc1dee0
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
}
@@
-20,16
+15,6
@@
class roles {
include nagios::server
}
include nagios::server
}
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'buildd') {
- include buildd
- }
-
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'porterbox') {
- include porterbox
- }
-
if has_role('bugs_mirror') {
include roles::bugs_mirror
}
if has_role('bugs_mirror') {
include roles::bugs_mirror
}
@@
-39,7
+24,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",
}
@@
-131,10
+116,6
@@
class roles {
include roles::syncproxy
}
include roles::syncproxy
}
- if has_role('static_master') {
- include roles::static_master
- }
-
if has_role('static_mirror') {
include roles::static_mirror
} elsif has_role('static_source') {
if has_role('static_mirror') {
include roles::static_mirror
} elsif has_role('static_source') {
@@
-158,11
+139,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
+182,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
}
@@
-224,10
+201,6
@@
class roles {
include roles::rtc
}
include roles::rtc
}
- if has_role('jenkins') {
- include roles::jenkins
- }
-
if has_role('postgres_backup_server') {
include postgres::backup_server
}
if has_role('postgres_backup_server') {
include postgres::backup_server
}
@@
-394,5
+367,4
@@
class roles {
if has_role('anonscm') {
include roles::anonscm
}
if has_role('anonscm') {
include roles::anonscm
}
-
}
}