aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2012-01-11 02:14:06 -0200
committerdrebs <drebs@riseup.net>2012-01-11 02:14:06 -0200
commita8129c4ade93c0396136ba4f92573bd1db009996 (patch)
treee2a899be4569158ffe91cc0f1f52535ecae03673
parentfb43acd59e29369405c502fab7b008c96eaa4c57 (diff)
downloadpuppet-tor-a8129c4ade93c0396136ba4f92573bd1db009996.tar.gz
puppet-tor-a8129c4ade93c0396136ba4f92573bd1db009996.tar.bz2
remving defines prefix
-rw-r--r--manifests/daemon.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 9fa75da..3f65e7d 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -68,7 +68,7 @@ class tor::daemon inherits tor {
}
# global configurations
- define tor::daemon::global_opts( $log_rules = [ 'notice file /var/log/tor/notices.log' ],
+ define global_opts( $log_rules = [ 'notice file /var/log/tor/notices.log' ],
$ensure = present ) {
file { "${spool_dir}/01.global":
content => template('tor/torrc.global.erb'),
@@ -80,7 +80,7 @@ class tor::daemon inherits tor {
}
# socks definition
- define tor::daemon::socks( $socks_port = 0,
+ define socks( $socks_port = 0,
$socks_listen_addresses = [],
$socks_policies = [] ) {
file { "${spool_dir}/02.socks":
@@ -93,7 +93,7 @@ class tor::daemon inherits tor {
}
# relay definition
- define tor::daemon::relay( $port = 0,
+ define relay( $port = 0,
$listen_addresses = [],
$relay_bandwidth_rate = 0, # KB/s, 0 for no limit.
$relay_bandwidth_burst = 0, # KB/s, 0 for no limit.
@@ -116,7 +116,7 @@ class tor::daemon inherits tor {
}
# control definition
- define tor::daemon::control( $port = 0,
+ define control( $port = 0,
$hashed_control_password = '',
$ensure = present ) {
file { "${spool_dir}/04.control":
@@ -129,7 +129,7 @@ class tor::daemon inherits tor {
}
# hidden services definition
- define tor::daemon::hidden_service( $ports = [],
+ define hidden_service( $ports = [],
$ensure = present ) {
file { "${spool_dir}/05.hidden_service.${name}":
content => template('tor/torrc.hidden_service.erb'),
@@ -141,7 +141,7 @@ class tor::daemon inherits tor {
}
# directory advertising
- define tor::daemon::directory ( $port = 0,
+ define directory ( $port = 0,
$listen_addresses = [],
$port_front_page = '',
$ensure = present ) {
@@ -161,7 +161,7 @@ class tor::daemon inherits tor {
}
# exit policies
- define tor::daemon::exit_policy( $accept = [],
+ define exit_policy( $accept = [],
$reject = [],
$ensure = present ) {
file { "${spool_dir}/07.exit_policy.${name}":