projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Register manualroutes from the service class for the three services that had it hardc...
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
aaeacee
..
a4445ee
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-1,79
+1,71
@@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+# include roles
+#
class roles {
class roles {
-
- if getfromhash($site::nodeinfo, 'puppetmaster') {
- include puppetmaster
- }
-
- if getfromhash($site::nodeinfo, 'muninmaster') {
+ if has_role('muninmaster') {
include munin::master
}
include munin::master
}
- #if getfromhash($site::nodeinfo, 'nagiosmaster') {
- # include nagios::server
- #}
-
- if getfromhash($site::nodeinfo, 'buildd') {
- include buildd
- }
-
- if getfromhash($site::nodeinfo, 'bugs_mirror') {
- include roles::bugs_mirror
+ if has_role('nagiosmaster') {
+ include nagios::server
}
}
- if getfromhash($site::nodeinfo, 'ftp_master') {
- include roles::ftp_master
- include roles::dakmaster
- }
-
- if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
- include roles::security_mirror
+ # archive.debian.org
+ if has_role('historical_mirror') {
+ include roles::historical_mirror
}
}
- if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
- include roles::www_mirror
+ # debug archive
+ if has_role('debug_mirror') {
+ include roles::debug_mirror
}
}
- if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
- include roles::backports_mirror
+ # ftp.debian.org and its ecosystem
+ if has_role('debian_mirror') {
+ include roles::debian_mirror
}
}
-
- if getfromhash($site::nodeinfo, 'ftp.d.o') {
- include roles::ftp
+ if has_role('ftp_master') {
+ include roles::ftp_master
+ include roles::dakmaster
+ include roles::signing
}
}
-
- if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
- include roles::ftp_upload
+ #
+ # security.debian.org
+ if has_role('security_master') {
+ include roles::security_master
+ include roles::dakmaster
}
}
- if getfromhash($site::nodeinfo, 'backports_master') {
- include roles::backports_master
- include roles::dakmaster
+ if has_role('security_mirror') {
+ include roles::security_mirror
}
}
- if getfromhash($site::nodeinfo, 'security_master') {
- include roles::security_master
- include roles::dakmaster
+ if has_role('postgres_backup_server') {
+ include postgres::backup_server
}
}
- if
getfromhash($site::nodeinfo, 'www_master')
{
- include roles::
www_master
+ if
$::hostname in [lw01, lw02, lw03, lw04, lw09, lw10]
{
+ include roles::
snapshot
}
}
- if
getfromhash($site::nodeinfo, 'keyring
') {
- include roles::
keyring
+ if
has_role('ports_master
') {
+ include roles::
ports_master
}
}
- if
getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror
') {
- include roles::
ftp-upcoming_mirror
+ if
has_role('bgp
') {
+ include roles::
bgp
}
}
- if
getfromhash($site::nodeinfo, 'static_mast
er') {
- include
roles::static_master
+ if
has_role('postgresql_serv
er') {
+ include
postgres::backup_source
}
}
- if getfromhash($site::nodeinfo, 'static_mirror') {
- include roles::static_mirror
- } elsif getfromhash($site::nodeinfo, 'static_source') {
- include roles::static_source
+ if $::keyring_debian_org_mirror {
+ include roles::keyring_debian_org_mirror
}
}
}
}