Updating tor hidden service handling to the new tor module

diff --git a/manifests/site.pp b/manifests/site.pp
index 7b8352746e92936c6d4388fa04fb0b3a809afdb5..a1d1803c4cc4ade9ff81c40b3c3141b3665249a5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -31,13 +31,15 @@ define apache::site($ensure = present, $docroot = false, $redirect = false,
 
   if $hidden_service == true {
     # Make sure that the tor daemon is included
-    include tor::daemon
+    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":
+    if !defined(File["${tor::daemon::data_dir}/hidden"]) {
+      file { "${tor::daemon::data_dir}/hidden":
         ensure => directory, 
         owner  => 'debian-tor',
         group  => 'debian-tor',
@@ -47,8 +49,8 @@ define apache::site($ensure = present, $docroot = false, $redirect = false,
 
     tor::daemon::hidden_service { $title:
       ports    => "80 127.0.0.1:80",
-      data_dir => "$tor::daemon::data_dir/hidden",
-      require  => File["$tor::daemon::data_dir/hidden"],
+      data_dir => "${tor::daemon::data_dir}/hidden",
+      require  => File["${tor::daemon::data_dir}/hidden"],
       ensure   => $ensure,
     }
   }