summaryrefslogtreecommitdiff
path: root/manifests/daemon
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2016-08-25 10:26:40 -0400
committerMicah Anderson <micah@riseup.net>2016-08-25 10:26:40 -0400
commit49b67cbc9112fddf49cc12264d2626fd952e0a7c (patch)
treee20311cd395d383fe145b93c6f388a466fd6d0de /manifests/daemon
parent687dccf2b5b99ea5b4f2fdfb115295ccff9a1c1a (diff)
Fixes for puppet lint
Diffstat (limited to 'manifests/daemon')
-rw-r--r--manifests/daemon/base.pp6
-rw-r--r--manifests/daemon/control.pp15
2 files changed, 12 insertions, 9 deletions
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,