From 43506968b1760b8a54f012c72baa9a5820cee21a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 28 Apr 2016 14:09:47 +0200
Subject: [style] Quote numbers in resource parameters

Puppet future parser won't allow unquoted numbers
---
 manifests/daemon/dns.pp         | 2 +-
 manifests/daemon/map_address.pp | 4 ++--
 manifests/daemon/transparent.pp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests/daemon')

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 e970fe5..270eac2 100644
--- a/manifests/daemon/map_address.pp
+++ b/manifests/daemon/map_address.pp
@@ -1,7 +1,7 @@
 # map address definition
 define tor::daemon::map_address(
   $address    = '',
-  $newaddress = ''
+  $newaddress = '',
   $ensure     = 'present') {
 
   concat::fragment { "08.map_address.${name}":
@@ -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,
   }
 }
-- 
cgit v1.2.3


From 49b67cbc9112fddf49cc12264d2626fd952e0a7c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 25 Aug 2016 10:26:40 -0400
Subject: Fixes for puppet lint

---
 manifests/daemon/base.pp    |  6 +++---
 manifests/daemon/control.pp | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'manifests/daemon')

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,
-- 
cgit v1.2.3