Merge remote-tracking branch 'origin' into riseup

12 files changed, 28 insertions, 24 deletions

diff --git a/README b/README
index 7777438..188acca 100644
--- a/README
+++ b/README
@@ -113,7 +113,7 @@ Installing torsocks
 
 To install torsocks, simply include the 'torsocks' class in your manifests:
 
-    class { 'torsocks': }
+    class { 'tor::torsocks': }
 
 You can specify the $ensure_version class parameter to get a specific
 version installed.
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
index 63d7bc4..c0b1640 100644
--- a/manifests/daemon/base.pp
+++ b/manifests/daemon/base.pp
@@ -49,9 +49,9 @@ class tor::daemon::base inherits tor::base {
 
   # tor configuration file
   concat { $tor::daemon::config_file:
-    mode   => '0600',
-    owner  => 'debian-tor',
-    group  => 'debian-tor',
+    mode  => '0600',
+    owner => 'debian-tor',
+    group => 'debian-tor',
   }
 
   # config file headers
diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp
index 0172656..d19a1db 100644
--- a/manifests/daemon/control.pp
+++ b/manifests/daemon/control.pp
@@ -7,13 +7,16 @@ define tor::daemon::control(
   $cookie_auth_file_group_readable = '',
   $ensure                          = present ) {
 
-  if $cookie_authentication == '0' and $hashed_control_password == '' and $ensure != 'absent' {
-    fail('You need to define the tor control password')
-  }
+  if $cookie_authentication == '0'
+    and $hashed_control_password == ''
+    and $ensure != 'absent' {
+      fail('You need to define the tor control password')
+    }
 
-  if $cookie_authentication == 0 and ($cookie_auth_file != '' or $cookie_auth_file_group_readable != '') {
-    notice('You set a tor cookie authentication option, but do not have cookie_authentication on')
-  }
+  if $cookie_authentication == 0
+    and ($cookie_auth_file != '' or $cookie_auth_file_group_readable != '') {
+      notice('You set a tor cookie authentication option, but do not have cookie_authentication on') # lint:ignore:80chars
+    }
 
   concat::fragment { '04.control':
     ensure  => $ensure,
diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp
index f3a7027..4677f24 100644
--- a/manifests/daemon/dns.pp
+++ b/manifests/daemon/dns.pp
@@ -10,7 +10,7 @@ define tor::daemon::dns(
     owner   => 'debian-tor',
     group   => 'debian-tor',
     mode    => '0644',
-    order   => 08,
+    order   => '08',
     target  => $tor::daemon::config_file,
   }
 }
diff --git a/manifests/daemon/map_address.pp b/manifests/daemon/map_address.pp
index cfbd3da..270eac2 100644
--- a/manifests/daemon/map_address.pp
+++ b/manifests/daemon/map_address.pp
@@ -10,7 +10,7 @@ define tor::daemon::map_address(
     owner   => 'debian-tor',
     group   => 'debian-tor',
     mode    => '0644',
-    order   => 08,
+    order   => '08',
     target  => $tor::daemon::config_file,
   }
 }
diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp
index 74fed4f..65d744f 100644
--- a/manifests/daemon/transparent.pp
+++ b/manifests/daemon/transparent.pp
@@ -10,7 +10,7 @@ define tor::daemon::transparent(
     owner   => 'debian-tor',
     group   => 'debian-tor',
     mode    => '0644',
-    order   => 09,
+    order   => '09',
     target  => $tor::daemon::config_file,
   }
 }
diff --git a/manifests/munin.pp b/manifests/munin.pp
index 4412337..2a01175 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -8,7 +8,7 @@ class tor::munin {
   }
 
   Munin::Plugin::Deploy {
-    config  => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie\n env.port 19051"
+    config  => "user debian-tor\n env.cookiefile /var/run/tor/control.authcookie\n env.port 19051" # lint:ignore:80chars
   }
   munin::plugin::deploy {
     'tor_connections':
diff --git a/manifests/repo.pp b/manifests/repo.pp
index f625599..9549219 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -1,3 +1,4 @@
+# setup repository for tor
 class tor::repo (
   $ensure      = present,
   $source_name = 'torproject.org',
@@ -10,7 +11,7 @@ class tor::repo (
       class { 'tor::repo::debian': }
     }
     default: {
-      fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily Debian and Ubuntu")
+      fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily Debian and Ubuntu") # lint:ignore:80chars
     }
   }
 }
diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
index 174c331..81976a2 100644
--- a/manifests/repo/debian.pp
+++ b/manifests/repo/debian.pp
@@ -1,6 +1,6 @@
 # PRIVATE CLASS: do not use directly
 class tor::repo::debian inherits tor::repo {
-  apt::source { $source_name:
+  apt::source { $tor::repo::source_name:
     ensure      => $::tor::repo::ensure,
     location    => $::tor::repo::location,
     key         => $::tor::repo::key,
diff --git a/templates/torrc.directory.erb b/templates/torrc.directory.erb
index 1af9f40..c7dc4ab 100644
--- a/templates/torrc.directory.erb
+++ b/templates/torrc.directory.erb
@@ -1,11 +1,11 @@
 # directory listing
-<%  if port != '0' -%>
+<%  if @port != '0' -%>
 DirPort <%= @port %>
 <%  end -%>
 <%  listen_addresses.each do |listen_address| -%>
 DirListenAddress <%= listen_address %>
 <%  end -%>
 <%  if @port_front_page != '' -%>
-DirPortFrontPage <%= port_front_page %>
+DirPortFrontPage <%= @port_front_page %>
 <%- end -%>
 
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index f577673..a02afc8 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -12,8 +12,8 @@ Log notice syslog
 Log <%= log_rule %>
 <%    end -%>
 <%  end -%>
-<%- if @safe_logging != 1 then -%>
-SafeLogging <%= @safe_logging %>
+<%- if (v=scope.lookupvar('tor::daemon::safe_logging')) != '1' then -%>
+SafeLogging <%= v %>
 <%-   end -%>
 
 <%  if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%>
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 511bda1..a286459 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -1,11 +1,11 @@
 # relay
 <% if @port != 0 -%>
 ORPort <%= @port %>
-<%   listen_addresses.each do |listen_address| -%>
-ORListenAddress <%= listen_address %>
+<%   @listen_addresses.each do |listen_address| -%>
+ORListenAddress <%= @listen_address %>
 <%   end -%>
-<%   real_outbound_bindaddresses.each do |outbound_bindaddress| -%>
-OutboundBindAddress <%= outbound_bindaddress %>
+<%   @real_outbound_bindaddresses.each do |outbound_bindaddress| -%>
+OutboundBindAddress <%= @outbound_bindaddress %>
 <%   end -%>
 <%   if @nickname != '' -%>
 Nickname <%= @nickname %>