From fae18b4cb919297eedfb7103e5d06ab76f93abff Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 8 Jun 2012 17:27:59 +0200
Subject: Decouple torsocks into its own class.

immerda's big decoupling commit (8f1d1c4) is too hard to apply in one shot in
the current state of the shared branch, so let's pick bits of it one after
the other.
---
 manifests/init.pp     | 5 -----
 manifests/torsocks.pp | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 manifests/torsocks.pp

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 0c38073..d916188 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,16 +1,11 @@
 class tor {
 
   if !$tor_ensure_version { $tor_ensure_version = 'installed' }
-  if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
   
   package { [ "tor", "tor-geoipdb" ]:
     ensure => $tor_ensure_version,
   }
 
-  package { "torsocks":
-    ensure => $torsocks_ensure_version,
-  }
-
   service { 'tor':
     ensure  => running,
     enable => true,
diff --git a/manifests/torsocks.pp b/manifests/torsocks.pp
new file mode 100644
index 0000000..6346707
--- /dev/null
+++ b/manifests/torsocks.pp
@@ -0,0 +1,7 @@
+class tor::torsocks {
+  if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
+  include ::tor
+  package{'torsocks':
+    ensure => $torsocks_ensure_version,
+  }
+}
-- 
cgit v1.2.3