diff options
author | Micah Anderson <micah@riseup.net> | 2017-01-23 12:51:35 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-01-23 12:51:35 -0500 |
commit | 6b723aec332a7034b80312431d5d7f55dc513136 (patch) | |
tree | afe07983b73618518065e51b0864d2db5a0c3dc9 /manifests | |
parent | 46ceed3ff73a9f33264eef179b0e2a9cf92ad151 (diff) | |
parent | 6e60d2c772be435fe375778523dec05239a43d0d (diff) |
Merge remote-tracking branch 'origin' into riseup
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/daemon/base.pp | 6 | ||||
-rw-r--r-- | manifests/daemon/control.pp | 15 | ||||
-rw-r--r-- | manifests/daemon/dns.pp | 2 | ||||
-rw-r--r-- | manifests/daemon/map_address.pp | 2 | ||||
-rw-r--r-- | manifests/daemon/transparent.pp | 2 | ||||
-rw-r--r-- | manifests/munin.pp | 2 | ||||
-rw-r--r-- | manifests/repo.pp | 3 | ||||
-rw-r--r-- | manifests/repo/debian.pp | 2 |
8 files changed, 19 insertions, 15 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, 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, |