projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decision: leave debdeltas off busoni
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
7af3d20
..
be8f3ab
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-19,7
+19,7
@@
class roles {
if has_role('nagiosmaster') {
# include nagios::server
ssl::service { 'nagios.debian.org':
if has_role('nagiosmaster') {
# include nagios::server
ssl::service { 'nagios.debian.org':
- notify
=> Service['apache2
'],
+ notify
=> Exec['service apache2 reload
'],
}
}
}
}
@@
-43,11
+43,11
@@
class roles {
if has_role('bugs_base') {
ssl::service { 'bugs.debian.org':
if has_role('bugs_base') {
ssl::service { 'bugs.debian.org':
- notify
=> Service['apache2
'],
+ notify
=> Exec['service apache2 reload
'],
}
}
if has_role('bugs_master') {
}
}
if has_role('bugs_master') {
- ssl::service { 'bugs-master.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'bugs-master.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('ftp_master') {
}
if has_role('ftp_master') {
@@
-57,12
+57,12
@@
class roles {
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
- notify
=> Service['apache2
'],
+ notify
=> Exec['service apache2 reload
'],
}
}
if has_role('manpages') {
}
}
if has_role('manpages') {
- ssl::service { 'manpages.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'manpages.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('security_mirror') {
}
if has_role('security_mirror') {
@@
-89,7
+89,8
@@
class roles {
}
if has_role('people') {
}
if has_role('people') {
- ssl::service { 'people.debian.org': notify => Service['apache2'], key => true, }
+ 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, }
}
if has_role('security_master') {
}
if has_role('security_master') {
@@
-102,7
+103,7
@@
class roles {
}
if has_role('cgi.d.o') {
}
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') {
}
if has_role('keyring') {
@@
-231,19
+232,19
@@
class roles {
}
if has_role('packages') {
}
if has_role('packages') {
- ssl::service { 'packages.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'packages.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('qamaster') {
}
if has_role('qamaster') {
- ssl::service { 'qa.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'qa.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('packagesqamaster') {
}
if has_role('packagesqamaster') {
- ssl::service { 'packages.qa.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'packages.qa.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('gobby_debian_org') {
}
if has_role('gobby_debian_org') {
- ssl::service { 'gobby.debian.org': notify
=> Service['apache2
'], key => true, tlsaport => [443, 6523], }
+ ssl::service { 'gobby.debian.org': notify
=> Exec['service apache2 reload
'], key => true, tlsaport => [443, 6523], }
}
if has_role('search_backend') {
}
if has_role('search_backend') {
@@
-265,7
+266,7
@@
class roles {
}
if has_role('veyepar.debian.org') {
}
if has_role('veyepar.debian.org') {
- ssl::service { 'veyepar.debian.org': notify
=> Service['apache2
'], key => true, }
+ ssl::service { 'veyepar.debian.org': notify
=> Exec['service apache2 reload
'], key => true, }
}
if has_role('httpredir') {
}
if has_role('httpredir') {
@@
-277,24
+278,24
@@
class roles {
}
if has_role('planet_search') {
}
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') {
}
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') {
}
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') {
}
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') {
}
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') {
}
if has_role('ports-master') {