summaryrefslogtreecommitdiff
path: root/manifests/daemon.pp
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
committerkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
commite598088c2f9263e7682e399b65376d7a2c529ded (patch)
treeaa628edf0ad55dc2adea8bc6f96bf516aaba0a30 /manifests/daemon.pp
parentd30831f7214da266ad943cf4013f0632e8b15d48 (diff)
parent77070c6bf97ecd6fc860cae6120dca86fa910e5a (diff)
Merge remote-tracking branch 'shared/master'HEADmaster
Diffstat (limited to 'manifests/daemon.pp')
-rw-r--r--manifests/daemon.pp10
1 files changed, 3 insertions, 7 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 2522b2c..55c881d 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,6 +1,5 @@
# manage a snippet based tor installation
class tor::daemon (
- $ensure_version = 'installed',
$use_munin = false,
$data_dir = '/var/lib/tor',
$config_file = '/etc/tor/torrc',
@@ -10,13 +9,10 @@ class tor::daemon (
$safe_logging = 1,
) {
- class{'tor':
- ensure_version => $ensure_version,
- }
-
- include tor::daemon::base
+ include ::tor
+ include ::tor::daemon::base
if $use_munin {
- include tor::munin
+ include ::tor::munin
}
}