From 830632458fa1179c8f267cdc44e571cddb6cd009 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 21 Jan 2013 12:44:14 -0200 Subject: Updating tor hidden service handling to the new tor module --- manifests/site.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'manifests/site.pp') diff --git a/manifests/site.pp b/manifests/site.pp index 7b83527..a1d1803 100644 --- 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, } } -- cgit v1.2.3