projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch the statis hosts to hiera roles
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
da2855b
..
e8320d4
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-15,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
}
@@
-34,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",
}
@@
-126,16
+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') {
- include roles::static_source
- }
-
if has_role('weblog_provider') {
include roles::weblog_provider
}
if has_role('weblog_provider') {
include roles::weblog_provider
}
@@
-215,10
+195,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
}