projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor static-components.conf.erb a bit - no logic changes yet
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
be8f3ab
..
843342b
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-20,6
+20,7
@@
class roles {
# include nagios::server
ssl::service { 'nagios.debian.org':
notify => Exec['service apache2 reload'],
# include nagios::server
ssl::service { 'nagios.debian.org':
notify => Exec['service apache2 reload'],
+ key => true,
}
}
}
}
@@
-58,6
+59,7
@@
class roles {
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
notify => Exec['service apache2 reload'],
if has_role('api.ftp-master') {
ssl::service { 'api.ftp-master.debian.org':
notify => Exec['service apache2 reload'],
+ key => true,
}
}
}
}
@@
-90,7
+92,7
@@
class roles {
if has_role('people') {
ssl::service { 'people.debian.org': notify => Exec['service apache2 reload'], key => true, }
if has_role('people') {
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, }
+ 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('security_master') {
@@
-204,10
+206,6
@@
class roles {
include roles::nm
}
include roles::nm
}
- if has_role('release') {
- include roles::release
- }
-
if has_role('rtc') {
include roles::rtc
}
if has_role('rtc') {
include roles::rtc
}