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.

diff --git a/manifests/init.pp b/manifests/init.pp
index 0c38073cdde0d3538c536160ec22921d5a71734a..d91618887ece2549a53c46db693af5697afabe59 100644 (file)
--- 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 (file)
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,
+  }
+}