From 93a35a6a7ac15a93cd1b4929acdaf61f11b96674 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 8 Jan 2012 20:53:05 -0200
Subject: Renaming polipo to tor::polipo class and sorting out defines

---
 manifests/daemon.pp | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'manifests/daemon.pp')

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index d8a18e8..7b28cd4 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,10 +1,30 @@
-class tor::daemon inherits tor {
+class tor::daemon inherits tor::polipo {
 
-  include polipo
+  group { "debian-tor":
+    ensure    => present,
+    allowdupe => false,
+  }
+
+  Package[ "tor", "torsocks" ] {
+    require => File["/var/tor"],
+  }
+
+  user { "debian-tor":
+    allowdupe => false,
+    comment   => "tor user,,,",
+    ensure    => present,
+    home      => "/var/tor",
+    shell     => "/bin/sh",
+    gid       => "debian-tor",
+    require   => Group["debian-tor"], 
+  }
 
-  service { "tor":
-    ensure  => running,
-    require => [ Package['tor'], Service["polipo"] ],
+  file { "/var/tor":
+    ensure  => directory,
+    mode    => 0755,
+    owner   => debian-tor,
+    group   => debian-tor,
+    require => User["debian-tor"],
   }
 
   define config( $socks_port = 9050,
-- 
cgit v1.2.3