From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Jan 2013 01:22:22 +0000 (-0200)
Subject: Including tor::daemon instead of inheritance
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=10917bcdaa1194f82604f9e34ab89f8f6ee018cb;p=puppet-nodo.git

Including tor::daemon instead of inheritance
---

diff --git a/manifests/subsystems/onion.pp b/manifests/subsystems/onion.pp
index 85ec4da..b190dcf 100644
--- a/manifests/subsystems/onion.pp
+++ b/manifests/subsystems/onion.pp
@@ -14,7 +14,9 @@ class onion {
   }
 }
 
-class onion::socks inherits tor::daemon {
+class onion::socks {
+  include tor::daemon
+
   # Default tor daemon configuration
   tor::daemon::socks { 'socks':
     port             => 9050,
@@ -22,7 +24,9 @@ class onion::socks inherits tor::daemon {
   }
 }
 
-class onion::freenode inherits tor::daemon {
+class onion::freenode {
+  include tor::daemon
+
   # Freenode via Tor
   # http://freenode.net/irc_servers.shtml
   # http://pthree.org/2010/01/31/freenode-ssl-and-sasl-authentication-with-irssi/