remving defines prefix

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 9fa75daca8cea106c18e48d2d5943e1ccc3decec..3f65e7df4b504717258d5dee0ffb777fb0db5938 100644 (file)
--- 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}":