diff options
Diffstat (limited to 'manifests/daemon')
| -rw-r--r-- | manifests/daemon/base.pp | 1 | ||||
| -rw-r--r-- | manifests/daemon/bridge.pp | 4 | ||||
| -rw-r--r-- | manifests/daemon/control.pp | 1 | ||||
| -rw-r--r-- | manifests/daemon/directory.pp | 2 | ||||
| -rw-r--r-- | manifests/daemon/dns.pp | 5 | ||||
| -rw-r--r-- | manifests/daemon/exit_policy.pp | 4 | ||||
| -rw-r--r-- | manifests/daemon/hidden_service.pp | 5 | ||||
| -rw-r--r-- | manifests/daemon/map_address.pp | 4 | ||||
| -rw-r--r-- | manifests/daemon/relay.pp | 4 | ||||
| -rw-r--r-- | manifests/daemon/snippet.pp | 4 | ||||
| -rw-r--r-- | manifests/daemon/socks.pp | 1 | ||||
| -rw-r--r-- | manifests/daemon/transparent.pp | 5 | ||||
| -rw-r--r-- | manifests/daemon/transport_plugin.pp | 13 |
13 files changed, 22 insertions, 31 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index c0c82ac..f3bbc37 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -56,7 +56,6 @@ class tor::daemon::base inherits tor::base { # config file headers concat::fragment { '00.header': - ensure => present, content => template('tor/torrc.header.erb'), order => 00, target => $tor::daemon::config_file, diff --git a/manifests/daemon/bridge.pp b/manifests/daemon/bridge.pp index 83d74e0..a448f82 100644 --- a/manifests/daemon/bridge.pp +++ b/manifests/daemon/bridge.pp @@ -2,11 +2,9 @@ define tor::daemon::bridge( $ip, $port, - $fingerprint = false, - $ensure = present ) { + $fingerprint = false ) { concat::fragment { "10.bridge.${name}": - ensure => $ensure, content => template('tor/torrc.bridge.erb'), order => 10, target => $tor::daemon::config_file, diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp index ee425f3..4137c3e 100644 --- a/manifests/daemon/control.pp +++ b/manifests/daemon/control.pp @@ -19,7 +19,6 @@ define tor::daemon::control( } concat::fragment { '04.control': - ensure => $ensure, content => template('tor/torrc.control.erb'), order => 04, target => $tor::daemon::config_file, diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp index e2e405d..3eaef9f 100644 --- a/manifests/daemon/directory.pp +++ b/manifests/daemon/directory.pp @@ -1,12 +1,10 @@ # directory advertising define tor::daemon::directory ( $port = 0, - $listen_addresses = [], $port_front_page = '/etc/tor/tor-exit-notice.html', $ensure = present ) { concat::fragment { '06.directory': - ensure => $ensure, content => template('tor/torrc.directory.erb'), order => 06, target => $tor::daemon::config_file, diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp index e8d4fc8..599abd8 100644 --- a/manifests/daemon/dns.pp +++ b/manifests/daemon/dns.pp @@ -1,11 +1,8 @@ # DNS definition define tor::daemon::dns( - $port = 0, - $listen_addresses = [], - $ensure = present ) { + $port = 0 ) { concat::fragment { "08.dns.${name}": - ensure => $ensure, content => template('tor/torrc.dns.erb'), order => '08', target => $tor::daemon::config_file, diff --git a/manifests/daemon/exit_policy.pp b/manifests/daemon/exit_policy.pp index df0fb99..c117d5d 100644 --- a/manifests/daemon/exit_policy.pp +++ b/manifests/daemon/exit_policy.pp @@ -2,11 +2,9 @@ define tor::daemon::exit_policy( $accept = [], $reject = [], - $reject_private = 1, - $ensure = present ) { + $reject_private = 1 ) { concat::fragment { "07.exit_policy.${name}": - ensure => $ensure, content => template('tor/torrc.exit_policy.erb'), order => 07, target => $tor::daemon::config_file, diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index d91bdc8..9e053cc 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -3,8 +3,8 @@ define tor::daemon::hidden_service( $ports = [], $single_hop = false, $v3 = false, - $data_dir = $tor::daemon::data_dir, - $ensure = present ) { + $data_dir = $tor::daemon::data_dir ) { + if $single_hop { @@ -14,7 +14,6 @@ define tor::daemon::hidden_service( } concat::fragment { "05.hidden_service.${name}": - ensure => $ensure, content => template('tor/torrc.hidden_service.erb'), order => 05, target => $tor::daemon::config_file, diff --git a/manifests/daemon/map_address.pp b/manifests/daemon/map_address.pp index ac624a0..1829eae 100644 --- a/manifests/daemon/map_address.pp +++ b/manifests/daemon/map_address.pp @@ -1,11 +1,9 @@ # map address definition define tor::daemon::map_address( $address = '', - $newaddress = '', - $ensure = 'present') { + $newaddress = '' ) { concat::fragment { "08.map_address.${name}": - ensure => $ensure, content => template('tor/torrc.map_address.erb'), order => '08', target => $tor::daemon::config_file, diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index 555587c..fa908f5 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -1,7 +1,6 @@ # relay definition define tor::daemon::relay( $port = 0, - $listen_addresses = [], $outbound_bindaddresses = [], $portforwarding = 0, # KB/s, defaulting to using tor's default: 5120KB/s @@ -14,7 +13,7 @@ define tor::daemon::relay( $relay_bandwidth_burst = 0, # GB, 0 for no limit $accounting_max = 0, - $accounting_start = [], + $accounting_start = "month 1 0:00", $contact_info = '', # TODO: autofill with other relays $my_family = '', @@ -31,7 +30,6 @@ define tor::daemon::relay( } concat::fragment { '03.relay': - ensure => $ensure, content => template('tor/torrc.relay.erb'), order => 03, target => $tor::daemon::config_file, diff --git a/manifests/daemon/snippet.pp b/manifests/daemon/snippet.pp index 7e1494c..5a4c091 100644 --- a/manifests/daemon/snippet.pp +++ b/manifests/daemon/snippet.pp @@ -1,10 +1,8 @@ # Arbitrary torrc snippet definition define tor::daemon::snippet( - $content = '', - $ensure = present ) { + $content = '' ) { concat::fragment { "99.snippet.${name}": - ensure => $ensure, content => $content, order => 99, target => $tor::daemon::config_file, diff --git a/manifests/daemon/socks.pp b/manifests/daemon/socks.pp index 54c8b6a..cb130d9 100644 --- a/manifests/daemon/socks.pp +++ b/manifests/daemon/socks.pp @@ -1,7 +1,6 @@ # socks definition define tor::daemon::socks( $port = 0, - $listen_addresses = [], $policies = [] ) { concat::fragment { '02.socks': diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp index 6ac7b44..90c0142 100644 --- a/manifests/daemon/transparent.pp +++ b/manifests/daemon/transparent.pp @@ -1,11 +1,8 @@ # Transparent proxy definition define tor::daemon::transparent( - $port = 0, - $listen_addresses = [], - $ensure = present ) { + $port = 0 ) { concat::fragment { "09.transparent.${name}": - ensure => $ensure, content => template('tor/torrc.transparent.erb'), order => '09', target => $tor::daemon::config_file, diff --git a/manifests/daemon/transport_plugin.pp b/manifests/daemon/transport_plugin.pp new file mode 100644 index 0000000..1921282 --- /dev/null +++ b/manifests/daemon/transport_plugin.pp @@ -0,0 +1,13 @@ +# transport plugin +define tor::daemon::transport_plugin( + $servertransport_plugin = '', + $servertransport_listenaddr = '', + $servertransport_options = '', + $ext_port = '' ) { + + concat::fragment { '11.transport_plugin': + content => template('tor/torrc.transport_plugin.erb'), + order => 11, + target => $tor::daemon::config_file, + } +} |