projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
onion for security
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
b92bbce
..
a6d6647
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-71,11
+71,9
@@
class roles {
}
}
}
}
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+ if has_role('security_mirror') {
include roles::security_mirror
}
include roles::security_mirror
}
-
if has_role('mirror_debug') {
include roles::debug_mirror
}
if has_role('mirror_debug') {
include roles::debug_mirror
}
@@
-102,6
+100,7
@@
class roles {
if has_role('people') {
ssl::service { 'people.debian.org':
notify => Service['apache2'],
if has_role('people') {
ssl::service { 'people.debian.org':
notify => Service['apache2'],
+ key => true,
}
}
}
}
@@
-350,4
+349,15
@@
class roles {
if has_role('ports-master') {
include roles::ports-master
}
if has_role('ports-master') {
include roles::ports-master
}
+
+ 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 roles::onionbalance
+ }
}
}