Fixing dependency on tor service

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 780fb21118b893d5c18d6bd63c55ea67569d8028..33785f8d213fd579b9c32bdfb7e39c45ad382d0f 100644 (file)
--- 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 fa2285dd1f5111cbbebaef1948f5d058ae7ef341..bd8943b1e45349d70ae927f46abbc422986eb1ac 100644 (file)
--- 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'],
+  }
 }