1 files changed, 5 insertions, 24 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 0c38073..9c19c64 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,25 +1,6 @@
-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,
-    hasrestart => true,
-    hasstatus => true,
-    require => Package['tor'],
-  }
-
-  if $use_munin {
-    include tor::munin
-  }
+# manage a basic tor installation
+class tor (
+  $ensure_version = 'installed'
+){
+  include tor::base
 }