From 6e3d87d88578447aa4358aabdf270df2082b422d Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 8 Feb 2013 23:11:15 -0800
Subject: changed contact_email to tor.contacts

---
 provider_base/services/tor.json           | 7 ++++---
 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': }
-- 
cgit v1.2.3