From 8786a1e07dc1665409278c0f012a0a11a786cdf6 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 15:26:14 -0400
Subject: fix package name for tor-geoipdb

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 731e939..6f3c90c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,7 +5,7 @@ class tor {
 
   if !$tor_ensure_version { $tor_ensure_version = 'installed' }
 
-  package { [ "tor", "tor-geoip", "torsocks" ]:
+  package { [ "tor", "tor-geoipdb", "torsocks" ]:
     ensure => $tor_ensure_version,
   }
 
-- 
cgit v1.2.3


From 44f4ba052ae9c02bc8923767885466c035fbb6ec Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 15:27:17 -0400
Subject: enable different version ensure for torssocks, it doesn't share the
 same version number as tor and tor-geoipdb, so if you set
 $tor_ensure_version, you will have an error with torsocks

---
 manifests/init.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 6f3c90c..ca5f2b8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,11 +4,16 @@ import "daemon.pp"
 class tor {
 
   if !$tor_ensure_version { $tor_ensure_version = 'installed' }
-
+  if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
+  
   package { [ "tor", "tor-geoipdb", "torsocks" ]:
     ensure => $tor_ensure_version,
   }
 
+  package { "torsocks":
+    ensure => $torsocks_ensure_version,
+  }
+
   service { 'tor':
     ensure  => running,
     enable => true,
-- 
cgit v1.2.3


From 0ac3ccf2d9f79db6c791339813f0e0f3b24ce16e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 15:33:28 -0400
Subject: fix duplicate definition of torssocks

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index ca5f2b8..ef2572e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,7 @@ class tor {
   if !$tor_ensure_version { $tor_ensure_version = 'installed' }
   if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
   
-  package { [ "tor", "tor-geoipdb", "torsocks" ]:
+  package { [ "tor", "tor-geoipdb" ]:
     ensure => $tor_ensure_version,
   }
 
-- 
cgit v1.2.3