diff options
| author | elijah <elijah@riseup.net> | 2013-02-08 23:11:15 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-02-08 23:11:15 -0800 |
| commit | 6e3d87d88578447aa4358aabdf270df2082b422d (patch) | |
| tree | 83f5c2806e11275363010436f851c57b7d0bd414 | |
| parent | 57adb7f3d527ecd4d3a41b6a1935b93c8266a688 (diff) | |
changed contact_email to tor.contacts
| -rw-r--r-- | provider_base/services/tor.json | 7 | ||||
| -rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json index 10806084..9173b8d4 100644 --- a/provider_base/services/tor.json +++ b/provider_base/services/tor.json @@ -1,5 +1,6 @@ { - "tor" : { - "bandwidth_rate" : 6550 - } + "tor": { + "bandwidth_rate": 6550, + "contacts": "= global.provider.contacts['tor'] || global.provider.contacts.default" + } } diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index dc16f91a..ceb6fb13 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -5,8 +5,8 @@ class site_tor { $bandwidth_rate = $tor['bandwidth_rate'] $tor_type = $tor['type'] $nickname = $tor['nickname'] + $contact_email = $tor['contacts'] - $contact_email = hiera('contact_email') $address = hiera('ip_address') class { 'tor::daemon': } |