summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-04-24 13:58:40 -0400
committerMicah Anderson <micah@leap.se>2014-04-24 13:58:40 -0400
commit0a9bcf49adab7120849806e4c6408d3f2887e09a (patch)
treea841fde15ba64dc992e65f060b46bcb6312ab574 /puppet/modules
parent18ae83d105bfa5c173d00d2fb17b0b72d42205bc (diff)
tor: provide a default 'nickname' (something like
"rabbitLKJYW23695JGLKJ" where rabbit is the node name). Stop shipping a static 'family' and instead provide a comma separated list of node tor nicknames. (#5220) Change-Id: I479f460ab230ad440f72c78dc6362983387ce12a
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_tor/manifests/init.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index 02368a0e..e62cb12d 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -7,6 +7,7 @@ class site_tor {
$tor_type = $tor['type']
$nickname = $tor['nickname']
$contact_emails = join($tor['contacts'],', ')
+ $family = $tor['family']
$address = hiera('ip_address')
@@ -16,7 +17,7 @@ class site_tor {
address => $address,
contact_info => obfuscate_email($contact_emails),
bandwidth_rate => $bandwidth_rate,
- my_family => '$2A431444756B0E7228A7918C85A8DACFF7E3B050',
+ my_family => $family
}
if ( $tor_type == 'exit'){