diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
| commit | 6100b6ded99241f10e7fb12c13a0820fda084912 (patch) | |
| tree | 863a9120010f32fdae304af94cd102c1da5096a6 /puppet/modules/site_tor/manifests/init.pp | |
| parent | 327d5c934e408f90011d7949b89ab01fed88998e (diff) | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
Merge branch 'develop' (0.5.1)0.5.1
Change-Id: I4e9d845f9758232f4da0d4bfbf785e52982b825b
Diffstat (limited to 'puppet/modules/site_tor/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 3 |
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'){ |