if has_role('nagiosmaster') {
# include nagios::server
ssl::service { 'nagios.debian.org':
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
+ key => true,
}
}
include porterbox
}
+ if has_role('archive_master') {
+ include archive_master
+ }
+
if has_role('bugs_mirror') {
include roles::bugs_mirror
}
if has_role('bugs_base') {
ssl::service { 'bugs.debian.org':
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
+ tlsaport => [],
}
}
if has_role('bugs_master') {
- ssl::service { 'bugs-master.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'bugs-master.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('ftp_master') {
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
- notify => Service['apache2'],
+ notify => Exec['service apache2 reload'],
+ key => true,
}
}
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
- include roles::security_mirror
+ if has_role('manpages') {
+ ssl::service { 'manpages.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
- include roles::www_mirror
+ if has_role('security_mirror') {
+ include roles::security_mirror
}
-
- if has_role('mirror_debug') {
+ if has_role('debug_mirror') {
include roles::debug_mirror
}
}
if has_role('people') {
- ssl::service { 'people.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'people.debian.org': notify => Exec['service apache2 reload'], key => true, }
+ onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
}
if has_role('security_master') {
}
if has_role('cgi.d.o') {
- ssl::service { 'cgi.debian.org':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'cgi.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('keyring') {
include roles::nm
}
- if has_role('release') {
- include roles::release
- }
-
if has_role('rtc') {
include roles::rtc
}
}
if has_role('packages') {
- ssl::service { 'packages.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'packages.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('qamaster') {
- ssl::service { 'qa.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'qa.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('packagesqamaster') {
- ssl::service { 'packages.qa.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'packages.qa.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('gobby_debian_org') {
- ssl::service { 'gobby.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'gobby.debian.org': notify => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
}
if has_role('search_backend') {
}
if has_role('veyepar.debian.org') {
- ssl::service { 'veyepar.debian.org':
- notify => Service['apache2'],
- }
+ ssl::service { 'veyepar.debian.org': notify => Exec['service apache2 reload'], key => true, }
+ }
+ if has_role('sreview.debian.org') {
+ ssl::service { 'sreview.debian.net': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('httpredir') {
}
if has_role('planet_search') {
- ssl::service { 'planet-search.debian.org':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'planet-search.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('i18n.d.o') {
- ssl::service { 'i18n.debian.org':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'i18n.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('l10n.d.o') {
- ssl::service { 'l10n.debian.org':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'l10n.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('dedup.d.n') {
- ssl::service { 'dedup.debian.net':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'dedup.debian.net': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('pet.d.n') {
- ssl::service { 'pet.debian.net':
- notify => Service['apache2'],
- key => true,
- }
- ssl::service { 'pet-devel.debian.net':
- notify => Service['apache2'],
- key => true,
- }
+ ssl::service { 'pet.debian.net': notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'pet-devel.debian.net': notify => Exec['service apache2 reload'], key => true, }
+ }
+
+ if has_role('ports-master') {
+ include roles::ports-master
+ }
+ if has_role('ports_mirror') {
+ include roles::ports_mirror
+ }
+
+ if $::hostname in [klecker] {
+ onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
+ }
+ if has_role('onionbalance') {
+ include onion::balance
}
}