projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move all roles from local.yaml to hiera
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
21559a8
..
261f84f
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-1,12
+1,10
@@
class roles {
class roles {
- $roles = hiera('roles')
-
- if $::fqdn in $roles['puppetmaster'] {
+ if has_role('puppetmaster') {
include puppetmaster
}
include puppetmaster
}
- if
getfromhash($site::nodeinfo,
'muninmaster') {
+ if
has_role(
'muninmaster') {
include munin::master
}
include munin::master
}
@@
-17,159
+15,134
@@
class roles {
}
}
}
}
- if
getfromhash($site::nodeinfo,
'buildd') {
+ if
has_role(
'buildd') {
include buildd
}
include buildd
}
- if
getfromhash($site::nodeinfo,
'porterbox') {
+ if
has_role(
'porterbox') {
include porterbox
}
include porterbox
}
- if
getfromhash($site::nodeinfo,
'bugs_mirror') {
+ if
has_role(
'bugs_mirror') {
include roles::bugs_mirror
}
include roles::bugs_mirror
}
- if
getfromhash($site::nodeinfo,
'ftp_master') {
+ if
has_role(
'ftp_master') {
include roles::ftp_master
include roles::dakmaster
}
include roles::ftp_master
include roles::dakmaster
}
- if
getfromhash($site::nodeinfo,
'apache2_security_mirror') {
+ if
has_role(
'apache2_security_mirror') {
include roles::security_mirror
}
include roles::security_mirror
}
- if
getfromhash($site::nodeinfo,
'apache2_www_mirror') {
+ if
has_role(
'apache2_www_mirror') {
include roles::www_mirror
}
include roles::www_mirror
}
- if
getfromhash($site::nodeinfo,
'ftp.d.o') {
+ if
has_role(
'ftp.d.o') {
include roles::ftp
}
include roles::ftp
}
- if
getfromhash($site::nodeinfo,
'ftp.upload.d.o') {
+ if
has_role(
'ftp.upload.d.o') {
include roles::ftp_upload
}
include roles::ftp_upload
}
- if
getfromhash($site::nodeinfo,
'security_master') {
+ if
has_role(
'security_master') {
include roles::security_master
include roles::dakmaster
}
include roles::security_master
include roles::dakmaster
}
- if
getfromhash($site::nodeinfo,
'www_master') {
+ if
has_role(
'www_master') {
include roles::www_master
}
include roles::www_master
}
- if
getfromhash($site::nodeinfo,
'keyring') {
+ if
has_role(
'keyring') {
include roles::keyring
}
include roles::keyring
}
- if
getfromhash($site::nodeinfo,
'wiki') {
+ if
has_role(
'wiki') {
include roles::wiki
}
include roles::wiki
}
- if
getfromhash($site::nodeinfo,
'syncproxy') {
+ if
has_role(
'syncproxy') {
include roles::syncproxy
}
include roles::syncproxy
}
- if
getfromhash($site::nodeinfo,
'static_master') {
+ if
has_role(
'static_master') {
include roles::static_master
}
include roles::static_master
}
- if
getfromhash($site::nodeinfo,
'static_mirror') {
+ if
has_role(
'static_mirror') {
include roles::static_mirror
include roles::static_mirror
- } elsif
getfromhash($site::nodeinfo,
'static_source') {
+ } elsif
has_role(
'static_source') {
include roles::static_source
}
include roles::static_source
}
- if
getfromhash($site::nodeinfo,
'weblog_provider') {
+ if
has_role(
'weblog_provider') {
include roles::weblog_provider
}
include roles::weblog_provider
}
- if
getfromhash($site::nodeinfo,
'mailrelay') {
+ if
has_role(
'mailrelay') {
include roles::mailrelay
}
include roles::mailrelay
}
- if
getfromhash($site::nodeinfo,
'pubsub') {
+ if
has_role(
'pubsub') {
include roles::pubsub
}
include roles::pubsub
}
- if getfromhash($site::nodeinfo, 'dbmaster') {
- ssl::service { 'db.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('dbmaster') {
+ include roles::dbmaster
}
}
- if
getfromhash($site::nodeinfo,
'dns_primary') {
+ if
has_role(
'dns_primary') {
include named::primary
}
include named::primary
}
- if
getfromhash($site::nodeinfo,
'dns_secondary') {
+ if
has_role(
'dns_secondary') {
include named::authoritative
}
include named::authoritative
}
- if
$::hostname in [ravel]
{
+ if
has_role('weblog_destination')
{
include roles::weblog_destination
}
include roles::weblog_destination
}
- if $::hostname in [vento] {
- ssl::service { 'vote.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('vote') {
+ include roles::vote
}
}
- if $::hostname in [soler] {
- ssl::service { 'security-tracker.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('security_tracker') {
+ include roles::security_tracker
}
}
- if $::hostname in [bendel] {
- ssl::service { 'lists.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('lists') {
+ include roles::lists
}
}
- if $::hostname in [reger] {
- ssl::service { 'rt.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('rtmaster') {
+ include roles::rtmaster
}
}
- if $::hostname in [diabelli] {
- ssl::service { 'sso.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('udd') {
+ include roles::udd
}
}
- if $::hostname in [ullmann] {
- ssl::service { 'udd.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('buildd_master') {
+ include roles::buildd_master
}
}
-
- if $::hostname in [wuiet] {
- ssl::service { 'buildd.debian.org':
- notify => Service['apache2'],
- }
+
+ if has_role('piuparts') {
+ include roles::piuparts
}
}
- if $::hostname in [pejacevic] {
- ssl::service { 'piuparts.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('contributors') {
+ include roles::contributors
}
}
- if $::hostname in [nono] {
- ssl::service { 'nm.debian.org':
- notify => Service['apache2'],
- }
- ssl::service { 'contributors.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('nm') {
+ include roles::nm
}
}
- if $::hostname in [franck] {
- ssl::service { 'release.debian.org':
- notify => Service['apache2'],
- }
+ if has_role('release') {
+ include roles::release
}
}
}
}