Including tor::daemon instead of inheritance

diff --git a/manifests/subsystems/onion.pp b/manifests/subsystems/onion.pp
index 85ec4da45043a5c0b82f393b2c8927f8e2aa64e6..b190dcf0b7bb48de5fe95d0a059fb447d4ec0dda 100644 (file)
--- 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/