From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 13 Jan 2012 12:18:22 +0000 (-0200)
Subject: Fixing dependency on tor service
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4daf3013fc6a437f6472c3526472e1d29302eecd;p=puppet-tor.git

Fixing dependency on tor service
---

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 780fb21..33785f8 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -8,9 +8,7 @@ class tor::daemon inherits tor {
   $snippet_dir = "${spool_dir}/torrc.d"
 
   # packages, user, group
-  service { 'tor':
-    ensure    => running,
-    require   => Package['tor'],
+  Service['tor'] {
     subscribe => File[$config_file],
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index fa2285d..bd8943b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,4 +5,9 @@ class tor {
   package { [ "tor", "torsocks" ]:
     ensure => installed,
   }
+
+  service { 'tor':
+    ensure  => running,
+    require => Package['tor'],
+  }
 }