From 8578cf78aca62636cd80bf1302d2946f2d62dbfe Mon Sep 17 00:00:00 2001
From: guido <guido@bruo.org>
Date: Tue, 2 Dec 2014 11:41:46 -0300
Subject: Use include to avoid redeclaration of class { 'tor::daemon': }. Fixes
 #6479

Change-Id: Ibd1b1eef7afca10cf2a2d56a24e703636d6a52c6
---
 puppet/modules/site_tor/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index d14e813d..80ccc5d3 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -18,8 +18,8 @@ class site_tor {
   else {
     $openvpn_ports = []
   }
-  
-  class { 'tor::daemon': }
+
+  include tor::daemon
   tor::daemon::relay { $nickname:
     port           => 9001,
     address        => $address,
-- 
cgit v1.2.3