From c3dd0d46949fd9bf7eff73ff3cc58c71a05936c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Thu, 5 Oct 2017 17:25:24 -0400 Subject: concat::fragment does not have an 'ensure' var anymore --- manifests/daemon/base.pp | 1 - manifests/daemon/bridge.pp | 4 +--- manifests/daemon/control.pp | 1 - manifests/daemon/directory.pp | 1 - manifests/daemon/dns.pp | 4 +--- manifests/daemon/exit_policy.pp | 4 +--- manifests/daemon/hidden_service.pp | 4 +--- manifests/daemon/map_address.pp | 4 +--- manifests/daemon/relay.pp | 1 - manifests/daemon/snippet.pp | 4 +--- manifests/daemon/transparent.pp | 4 +--- 11 files changed, 7 insertions(+), 25 deletions(-) diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index c0c82ac..f3bbc37 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -56,7 +56,6 @@ class tor::daemon::base inherits tor::base { # config file headers concat::fragment { '00.header': - ensure => present, content => template('tor/torrc.header.erb'), order => 00, target => $tor::daemon::config_file, diff --git a/manifests/daemon/bridge.pp b/manifests/daemon/bridge.pp index 83d74e0..a448f82 100644 --- a/manifests/daemon/bridge.pp +++ b/manifests/daemon/bridge.pp @@ -2,11 +2,9 @@ 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'), order => 10, target => $tor::daemon::config_file, diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp index ee425f3..4137c3e 100644 --- a/manifests/daemon/control.pp +++ b/manifests/daemon/control.pp @@ -19,7 +19,6 @@ define tor::daemon::control( } concat::fragment { '04.control': - ensure => $ensure, content => template('tor/torrc.control.erb'), order => 04, target => $tor::daemon::config_file, diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp index e2e405d..fa7d52d 100644 --- a/manifests/daemon/directory.pp +++ b/manifests/daemon/directory.pp @@ -6,7 +6,6 @@ define tor::daemon::directory ( $ensure = present ) { concat::fragment { '06.directory': - ensure => $ensure, content => template('tor/torrc.directory.erb'), order => 06, target => $tor::daemon::config_file, diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp index e8d4fc8..e2141c9 100644 --- a/manifests/daemon/dns.pp +++ b/manifests/daemon/dns.pp @@ -1,11 +1,9 @@ # DNS definition define tor::daemon::dns( $port = 0, - $listen_addresses = [], - $ensure = present ) { + $listen_addresses = [] ) { concat::fragment { "08.dns.${name}": - ensure => $ensure, content => template('tor/torrc.dns.erb'), order => '08', target => $tor::daemon::config_file, diff --git a/manifests/daemon/exit_policy.pp b/manifests/daemon/exit_policy.pp index df0fb99..c117d5d 100644 --- a/manifests/daemon/exit_policy.pp +++ b/manifests/daemon/exit_policy.pp @@ -2,11 +2,9 @@ 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'), order => 07, target => $tor::daemon::config_file, diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index 07121bd..4549cc7 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -2,8 +2,7 @@ define tor::daemon::hidden_service( $ports = [], $single_hop = false, - $data_dir = $tor::daemon::data_dir, - $ensure = present ) { + $data_dir = $tor::daemon::data_dir ) { if $single_hop { @@ -13,7 +12,6 @@ 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 ac624a0..1829eae 100644 --- a/manifests/daemon/map_address.pp +++ b/manifests/daemon/map_address.pp @@ -1,11 +1,9 @@ # 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'), order => '08', target => $tor::daemon::config_file, diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index 555587c..115eb25 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -31,7 +31,6 @@ define tor::daemon::relay( } concat::fragment { '03.relay': - ensure => $ensure, content => template('tor/torrc.relay.erb'), order => 03, target => $tor::daemon::config_file, diff --git a/manifests/daemon/snippet.pp b/manifests/daemon/snippet.pp index 7e1494c..5a4c091 100644 --- a/manifests/daemon/snippet.pp +++ b/manifests/daemon/snippet.pp @@ -1,10 +1,8 @@ # Arbitrary torrc snippet definition define tor::daemon::snippet( - $content = '', - $ensure = present ) { + $content = '' ) { concat::fragment { "99.snippet.${name}": - ensure => $ensure, content => $content, order => 99, target => $tor::daemon::config_file, diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp index 6ac7b44..7115fee 100644 --- a/manifests/daemon/transparent.pp +++ b/manifests/daemon/transparent.pp @@ -1,11 +1,9 @@ # Transparent proxy definition define tor::daemon::transparent( $port = 0, - $listen_addresses = [], - $ensure = present ) { + $listen_addresses = [] ) { concat::fragment { "09.transparent.${name}": - ensure => $ensure, content => template('tor/torrc.transparent.erb'), order => '09', target => $tor::daemon::config_file, -- cgit v1.2.3