projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start an onion module
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
fc13165
..
441e20c
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-79,6
+79,9
@@
class roles {
if has_role('mirror_debug') {
include roles::debug_mirror
}
if has_role('mirror_debug') {
include roles::debug_mirror
}
+ if has_role('mirror_ports') {
+ include roles::ports_mirror
+ }
if has_role('ftp.d.o') {
include roles::ftp
if has_role('ftp.d.o') {
include roles::ftp
@@
-99,6
+102,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,
}
}
}
}
@@
-253,12
+257,14
@@
class roles {
if has_role('qamaster') {
ssl::service { 'qa.debian.org':
notify => Service['apache2'],
if has_role('qamaster') {
ssl::service { 'qa.debian.org':
notify => Service['apache2'],
+ key => true,
}
}
if has_role('packagesqamaster') {
ssl::service { 'packages.qa.debian.org':
notify => Service['apache2'],
}
}
if has_role('packagesqamaster') {
ssl::service { 'packages.qa.debian.org':
notify => Service['apache2'],
+ key => true,
}
}
}
}
@@
-291,6
+297,7
@@
class roles {
if has_role('veyepar.debian.org') {
ssl::service { 'veyepar.debian.org':
notify => Service['apache2'],
if has_role('veyepar.debian.org') {
ssl::service { 'veyepar.debian.org':
notify => Service['apache2'],
+ key => true,
}
}
}
}
@@
-340,4
+347,16
@@
class roles {
key => true,
}
}
key => true,
}
}
+
+ 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,
+ }
+ }
}
}