diff options
| author | varac <varacanero@zeromail.org> | 2013-10-30 22:30:13 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-30 22:30:13 +0100 |
| commit | 94db97455250a3eb92ed7e55c23ce0f6d991e206 (patch) | |
| tree | 452f650df2f084ee9812cb6769a63940fb9dc504 /puppet/modules/site_tor | |
| parent | 6492bf38a0e092d9eaa4a56a80c441d9eb272da6 (diff) | |
| parent | 367f1402ddb23f50c9b47d8f35bef31ac83fcd81 (diff) | |
Merge branch 'feature/3974_site_tor__can_t_convert_String' into develop
Diffstat (limited to 'puppet/modules/site_tor')
| -rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index 16ee4c30..b6e73a23 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -1,12 +1,12 @@ class site_tor { tag 'leap_service' Class['site_config::default'] -> Class['site_tor'] - + $tor = hiera('tor') $bandwidth_rate = $tor['bandwidth_rate'] $tor_type = $tor['type'] $nickname = $tor['nickname'] - $contact_email = $tor['contacts'] + $contact_emails = join($tor['contacts'],', ') $address = hiera('ip_address') @@ -14,7 +14,7 @@ class site_tor { tor::daemon::relay { $nickname: port => 9001, address => $address, - contact_info => obfuscate_email($contact_email), + contact_info => obfuscate_email($contact_emails), bandwidth_rate => $bandwidth_rate, my_family => '$2A431444756B0E7228A7918C85A8DACFF7E3B050', } |