diff options
| author | varac <varacanero@zeromail.org> | 2013-10-22 13:38:02 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-22 13:39:25 +0200 |
| commit | 367f1402ddb23f50c9b47d8f35bef31ac83fcd81 (patch) | |
| tree | b3a1d0a49e163ab7b67f78ccc8d1f2912df52ace | |
| parent | bf42d6764421c182401f981b3463f261044e9878 (diff) | |
site_tor: can't convert String into Integer (Bug #3974)
tor.contacts has been a string, and is now an array of email addresses
this change needed to be adopted also in
stdlib/lib/puppet/parser/functions/obfuscate_email.rb (see #4193).
| -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', } |