aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-20 23:25:55 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-20 23:25:55 -0200
commit61504752fe9af00e93bf120a24ca57ef42abbe7e (patch)
tree276141c8abb8d1d01c573fe31b4c8249741fd04d
parent10917bcdaa1194f82604f9e34ab89f8f6ee018cb (diff)
downloadpuppet-nodo-61504752fe9af00e93bf120a24ca57ef42abbe7e.tar.gz
puppet-nodo-61504752fe9af00e93bf120a24ca57ef42abbe7e.tar.bz2
Changing inheritance of onion classes
-rw-r--r--manifests/subsystems/onion.pp8
1 files changed, 2 insertions, 6 deletions
diff --git a/manifests/subsystems/onion.pp b/manifests/subsystems/onion.pp
index b190dcf..7d86948 100644
--- a/manifests/subsystems/onion.pp
+++ b/manifests/subsystems/onion.pp
@@ -14,9 +14,7 @@ class onion {
}
}
-class onion::socks {
- include tor::daemon
-
+class onion::socks inherits onion {
# Default tor daemon configuration
tor::daemon::socks { 'socks':
port => 9050,
@@ -24,9 +22,7 @@ class onion::socks {
}
}
-class onion::freenode {
- include tor::daemon
-
+class onion::freenode inherits onion::socks {
# Freenode via Tor
# http://freenode.net/irc_servers.shtml
# http://pthree.org/2010/01/31/freenode-ssl-and-sasl-authentication-with-irssi/