Merge branch 'master' into riseup

13 files changed, 23 insertions, 69 deletions

diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
index c0b1640..f3bbc37 100644
--- a/manifests/daemon/base.pp
+++ b/manifests/daemon/base.pp
@@ -2,7 +2,7 @@
 class tor::daemon::base inherits tor::base {
   # packages, user, group
   Service['tor'] {
-    subscribe => File[$tor::daemon::config_file],
+    subscribe => Concat[$tor::daemon::config_file],
   }
 
   Package[ 'tor' ] {
@@ -56,11 +56,7 @@ class tor::daemon::base inherits tor::base {
 
   # config file headers
   concat::fragment { '00.header':
-    ensure  => present,
     content => template('tor/torrc.header.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 00,
     target  => $tor::daemon::config_file,
   }
@@ -68,9 +64,6 @@ class tor::daemon::base inherits tor::base {
   # global configurations
   concat::fragment { '01.global':
     content => template('tor/torrc.global.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 01,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/bridge.pp b/manifests/daemon/bridge.pp
index 063f565..a448f82 100644
--- a/manifests/daemon/bridge.pp
+++ b/manifests/daemon/bridge.pp
@@ -2,15 +2,10 @@
 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 10,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp
index d19a1db..4137c3e 100644
--- a/manifests/daemon/control.pp
+++ b/manifests/daemon/control.pp
@@ -19,11 +19,7 @@ define tor::daemon::control(
     }
 
   concat::fragment { '04.control':
-    ensure  => $ensure,
     content => template('tor/torrc.control.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0600',
     order   => 04,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp
index d877a86..3eaef9f 100644
--- a/manifests/daemon/directory.pp
+++ b/manifests/daemon/directory.pp
@@ -1,16 +1,11 @@
 # 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 06,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp
index 4677f24..599abd8 100644
--- a/manifests/daemon/dns.pp
+++ b/manifests/daemon/dns.pp
@@ -1,15 +1,9 @@
 # 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => '08',
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/exit_policy.pp b/manifests/daemon/exit_policy.pp
index f459ece..c117d5d 100644
--- a/manifests/daemon/exit_policy.pp
+++ b/manifests/daemon/exit_policy.pp
@@ -2,15 +2,10 @@
 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 07,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index 02ddf25..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,10 +14,8 @@ 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 270eac2..1829eae 100644
--- a/manifests/daemon/map_address.pp
+++ b/manifests/daemon/map_address.pp
@@ -1,15 +1,10 @@
 # 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => '08',
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp
index ff52893..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,11 +30,7 @@ define tor::daemon::relay(
   }
 
   concat::fragment { '03.relay':
-    ensure  => $ensure,
     content => template('tor/torrc.relay.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 03,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/snippet.pp b/manifests/daemon/snippet.pp
index b9089b4..5a4c091 100644
--- a/manifests/daemon/snippet.pp
+++ b/manifests/daemon/snippet.pp
@@ -1,14 +1,9 @@
 # Arbitrary torrc snippet definition
 define tor::daemon::snippet(
-  $content = '',
-  $ensure  = present ) {
+  $content = '' ) {
 
   concat::fragment { "99.snippet.${name}":
-    ensure  => $ensure,
     content => $content,
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 99,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/socks.pp b/manifests/daemon/socks.pp
index 910461c..cb130d9 100644
--- a/manifests/daemon/socks.pp
+++ b/manifests/daemon/socks.pp
@@ -1,14 +1,10 @@
 # socks definition
 define tor::daemon::socks(
   $port = 0,
-  $listen_addresses = [],
   $policies = [] ) {
 
   concat::fragment { '02.socks':
     content => template('tor/torrc.socks.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 02,
     target  => $tor::daemon::config_file,
   }
diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp
index 65d744f..90c0142 100644
--- a/manifests/daemon/transparent.pp
+++ b/manifests/daemon/transparent.pp
@@ -1,15 +1,9 @@
 # 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'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     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,
+  }
+}