Renaming polipo to tor::polipo class and sorting out defines

1 files changed, 3 insertions, 26 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index cdcd028..a2b9885 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,35 +4,12 @@ import "relay.pp"
 import "bridge.pp"
 
 class tor {
-  package { "privoxy":
-    ensure => absent,
-  }
-
   package { [ "tor", "torsocks" ]:
     ensure => installed,
-    require => File["/var/tor"],
-  }
-
-  group { "debian-tor":
-    ensure    => present,
-    allowdupe => false,
-  }
-
-  user { "debian-tor":
-    allowdupe => false,
-    comment   => "tor user,,,",
-    ensure    => present,
-    home      => "/var/tor",
-    shell     => "/bin/sh",
-    gid       => "debian-tor",
-    require   => Group["debian-tor"], 
   }
 
-  file { "/var/tor":
-    ensure  => directory,
-    mode    => 0755,
-    owner   => debian-tor,
-    group   => debian-tor,
-    require => User["debian-tor"],
+  service { "tor": {
+    ensure  => running,
+    require => Package['tor'],
   }
 }