projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new module elasticsearch for listsearch
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
c83884e
..
cab8edd
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-53,6
+53,12
@@
class roles {
include roles::dakmaster
}
include roles::dakmaster
}
+ if has_role('api.ftp-master') {
+ ssl::service { 'api.ftp-master.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
include roles::security_mirror
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
include roles::security_mirror
@@
-75,6
+81,12
@@
class roles {
include roles::git_master
}
include roles::git_master
}
+ if has_role('people') {
+ ssl::service { 'people.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if has_role('security_master') {
include roles::security_master
include roles::dakmaster
if has_role('security_master') {
include roles::security_master
include roles::dakmaster
@@
-125,9
+137,6
@@
class roles {
if has_role('dns_primary') {
include named::primary
}
if has_role('dns_primary') {
include named::primary
}
- if has_role('dns_secondary') {
- include named::authoritative
- }
if has_role('weblog_destination') {
include roles::weblog_destination
if has_role('weblog_destination') {
include roles::weblog_destination
@@
-145,6
+154,10
@@
class roles {
include roles::lists
}
include roles::lists
}
+ if has_role('list_search') {
+ include roles::listsearch
+ }
+
if has_role('rtmaster') {
include roles::rtmaster
}
if has_role('rtmaster') {
include roles::rtmaster
}
@@
-157,10
+170,18
@@
class roles {
include roles::sso
}
include roles::sso
}
+ if has_role('tracker') {
+ include roles::tracker
+ }
+
if has_role('buildd_master') {
include roles::buildd_master
}
if has_role('buildd_master') {
include roles::buildd_master
}
+ if has_role('buildd_ports_master') {
+ include roles::buildd_ports_master
+ }
+
if has_role('piuparts') {
include roles::piuparts
}
if has_role('piuparts') {
include roles::piuparts
}
@@
-195,9
+216,28
@@
class roles {
}
}
}
}
+ if has_role('qamaster') {
+ ssl::service { 'qa.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
+ if has_role('packagesqamaster') {
+ ssl::service { 'packages.qa.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org':
tlsaport => 0,
}
}
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org':
tlsaport => 0,
}
}
+
+ if has_role('search_backend') {
+ include search_backend
+ }
+ if has_role('search_frontend') {
+ include search_frontend
+ }
}
}