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

3 files changed, 34 insertions, 33 deletions

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,
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'],
   }
 }
diff --git a/manifests/polipo.pp b/manifests/polipo.pp
index d7b1caa..79a6cdd 100644
--- a/manifests/polipo.pp
+++ b/manifests/polipo.pp
@@ -1,4 +1,8 @@
-class polipo {
+class tor::polipo inherits tor {
+
+  package { "privoxy":
+    ensure => absent,
+  }
 
   package { "polipo":
     ensure => installed,
@@ -6,7 +10,7 @@ class polipo {
 
   service { "polipo":
     ensure  => running,
-    require => Package["polipo"],
+    require => [ Package["polipo"], Service["tor"] ],
   }
 
   file { "/etc/polipo":