Class tor::daemon should be declared apart

diff --git a/manifests/site.pp b/manifests/site.pp
index 732559cafe8ae1209cef2556b4c822812ce5fc6a..30f462eefe955a4c675ebd87ab0453fe69993a2e 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,23 +27,6 @@ define apache::site($ensure = present, $docroot = false, $redirect = false,
   }
 
   if $hidden_service == true {
-    # Make sure that the tor daemon is included
-    if !defined('tor::daemon') {
-      class { 'tor::daemon': }
-    }
-
-    # It's important to use a subdir from the tor datadir
-    # to ease backup/restore procedures as we don't mix
-    # hidden service data with other tor files.
-    if !defined(File["${tor::daemon::data_dir}/hidden"]) {
-      file { "${tor::daemon::data_dir}/hidden":
-        ensure => directory, 
-        owner  => 'debian-tor',
-        group  => 'debian-tor',
-        mode   => 0700,
-      }
-    }
-
     tor::daemon::hidden_service { $title:
       ports    => [ "80 127.0.0.1:80" ],
       data_dir => "${tor::daemon::data_dir}/hidden",