service subscribes to config file

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index d70674e8043305221dc7833b642f3dcf1ece1243..780fb21118b893d5c18d6bd63c55ea67569d8028 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -8,15 +8,21 @@ class tor::daemon inherits tor {
   $snippet_dir = "${spool_dir}/torrc.d"
 
   # packages, user, group
-  group { 'debian-tor':
-    ensure    => present,
-    allowdupe => false,
+  service { 'tor':
+    ensure    => running,
+    require   => Package['tor'],
+    subscribe => File[$config_file],
   }
 
   Package[ 'tor', 'torsocks' ] {
     require => File[$data_dir],
   }
 
+  group { 'debian-tor':
+    ensure    => present,
+    allowdupe => false,
+  }
+
   user { 'debian-tor':
     allowdupe => false,
     comment   => 'tor user,,,',
@@ -59,7 +65,6 @@ class tor::daemon inherits tor {
   concatenated_file { "${config_file}":
     dir    => $snippet_dir,
     mode   => 0600,
-    notify => Service['tor'],
     owner => 'debian-tor', group => 'debian-tor', 
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 87e9773f60a4c53dd7a5eaad9f31ad92c052d1af..fa2285dd1f5111cbbebaef1948f5d058ae7ef341 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,9 +5,4 @@ class tor {
   package { [ "tor", "torsocks" ]:
     ensure => installed,
   }
-
-  service { "tor":
-    ensure  => running,
-    require => Package['tor'],
-  }
 }