diff options
| author | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
| commit | 7bf57976706f73881d18bbaea0e7f87b7f1c3b40 (patch) | |
| tree | 38af3a1f768f4b6501d0fb91d3f788ce92fb1a9a /manifests | |
| parent | 510e81d04bdfa15dadb272431fbe78d320d3fc68 (diff) | |
| parent | e1d9f793aa356982b017ed197e19f4cdbb84cb83 (diff) | |
| download | puppet-tor-7bf57976706f73881d18bbaea0e7f87b7f1c3b40.tar.gz puppet-tor-7bf57976706f73881d18bbaea0e7f87b7f1c3b40.tar.bz2 | |
Merge remote-tracking branch 'riseup/master'
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/daemon.pp | 24 | ||||
| -rw-r--r-- | manifests/init.pp | 9 |
2 files changed, 20 insertions, 13 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 5f4e064..6d8c315 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -98,17 +98,18 @@ class tor::daemon inherits tor { } # relay definition - define relay( $port = 0, - $listen_addresses = [], - $bandwidth_rate = 0, # KB/s, 0 for no limit. - $bandwidth_burst = 0, # KB/s, 0 for no limit. - $accounting_max = 0, # GB, 0 for no limit. - $accounting_start = [], - $contact_info = '', - $my_family = '', # TODO: autofill with other relays - $address = "tor.${domain}", - $bridge_relay = 0, - $ensure = present ) { + define relay( $port = 0, + $listen_addresses = [], + $outbound_bindaddresses = $listen_addresses, + $bandwidth_rate = 0, # KB/s, 0 for no limit. + $bandwidth_burst = 0, # KB/s, 0 for no limit. + $accounting_max = 0, # GB, 0 for no limit. + $accounting_start = [], + $contact_info = '', + $my_family = '', # TODO: autofill with other relays + $address = "tor.${domain}", + $bridge_relay = 0, + $ensure = present ) { $nickname = $name concatenated_file_part { '03.relay': @@ -173,6 +174,7 @@ class tor::daemon inherits tor { # exit policies define exit_policy( $accept = [], $reject = [], + $reject_private = 1, $ensure = present ) { concatenated_file_part { "07.exit_policy.${name}": diff --git a/manifests/init.pp b/manifests/init.pp index a998d48..0c38073 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,11 +1,16 @@ class tor { if !$tor_ensure_version { $tor_ensure_version = 'installed' } - - package { [ "tor", "tor-geoip", "torsocks" ]: + if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'} + + package { [ "tor", "tor-geoipdb" ]: ensure => $tor_ensure_version, } + package { "torsocks": + ensure => $torsocks_ensure_version, + } + service { 'tor': ensure => running, enable => true, |