diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:22:22 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:22:22 -0200 |
commit | 10917bcdaa1194f82604f9e34ab89f8f6ee018cb (patch) | |
tree | 0985cd65127e931716efc8b50a5f7a489f2c8fad | |
parent | df49fe26e1dbfd9cd748d28d492983543541bb78 (diff) | |
download | puppet-nodo-10917bcdaa1194f82604f9e34ab89f8f6ee018cb.tar.gz puppet-nodo-10917bcdaa1194f82604f9e34ab89f8f6ee018cb.tar.bz2 |
Including tor::daemon instead of inheritance
-rw-r--r-- | manifests/subsystems/onion.pp | 8 |
1 files changed, 6 insertions, 2 deletions
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/ |