make it work with newer concat module

13 files changed, 95 insertions, 84 deletions

diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp
index 335c5e4..86156af 100644
--- a/manifests/daemon/base.pp
+++ b/manifests/daemon/base.pp
@@ -48,7 +48,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 a9a21d4..e09f4f7 100644
--- a/manifests/daemon/bridge.pp
+++ b/manifests/daemon/bridge.pp
@@ -3,13 +3,14 @@ define tor::daemon::bridge(
   $ip,
   $port,
   $fingerprint = false,
-  $ensure      = present ) {
-
-  concat::fragment { "10.bridge.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.bridge.erb'),
-    order   => '10',
-    target  => $tor::daemon::config_file,
+  $ensure      = 'present',
+) {
+  if $ensure == 'present' {
+    concat::fragment { "10.bridge.${name}":
+      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 5e81c65..027a49d 100644
--- a/manifests/daemon/control.pp
+++ b/manifests/daemon/control.pp
@@ -1,24 +1,26 @@
 # control definition
 define tor::daemon::control(
+  $ensure                          = 'present',
   $port                            = 0,
   $hashed_control_password         = '',
   $cookie_authentication           = 0,
   $cookie_auth_file                = '',
   $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 $ensure == 'present' {
+    if $cookie_authentication == '0' and $hashed_control_password == '' {
+      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')
+    }
 
-  concat::fragment { '04.control':
-    ensure  => $ensure,
-    content => template('tor/torrc.control.erb'),
-    order   => '04',
-    target  => $tor::daemon::config_file,
+    concat::fragment { '04.control':
+      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 4dc2afa..3bbf273 100644
--- a/manifests/daemon/directory.pp
+++ b/manifests/daemon/directory.pp
@@ -1,15 +1,16 @@
 # directory advertising
 define tor::daemon::directory (
+  $ensure           = 'present',
   $port             = 0,
   $listen_addresses = [],
   $port_front_page  = '/etc/tor/tor-exit-notice.html',
-  $ensure           = present ) {
-
-  concat::fragment { '06.directory':
-    ensure  => $ensure,
-    content => template('tor/torrc.directory.erb'),
-    order   => '06',
-    target  => $tor::daemon::config_file,
+) {
+  if $ensure == 'present' {
+    concat::fragment { '06.directory':
+      content => template('tor/torrc.directory.erb'),
+      order   => '06',
+      target  => $tor::daemon::config_file,
+    }
   }
 
   include ::tor::daemon::params
diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp
index e8d4fc8..3ae8c77 100644
--- a/manifests/daemon/dns.pp
+++ b/manifests/daemon/dns.pp
@@ -1,14 +1,15 @@
 # DNS definition
 define tor::daemon::dns(
+  $ensure           = 'present',
   $port             = 0,
   $listen_addresses = [],
-  $ensure           = present ) {
-
-  concat::fragment { "08.dns.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.dns.erb'),
-    order   => '08',
-    target  => $tor::daemon::config_file,
+){
+  if $ensure == 'present' {
+    concat::fragment { "08.dns.${name}":
+      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 5f4d3e8..62876c7 100644
--- a/manifests/daemon/exit_policy.pp
+++ b/manifests/daemon/exit_policy.pp
@@ -1,15 +1,16 @@
 # exit policies
 define tor::daemon::exit_policy(
+  $ensure         = 'present',
   $accept         = [],
   $reject         = [],
   $reject_private = 1,
-  $ensure         = present ) {
-
-  concat::fragment { "07.exit_policy.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.exit_policy.erb'),
-    order   => '07',
-    target  => $tor::daemon::config_file,
+) {
+  if $ensure == 'present' {
+    concat::fragment { "07.exit_policy.${name}":
+      content => template('tor/torrc.exit_policy.erb'),
+      order   => '07',
+      target  => $tor::daemon::config_file,
+    }
   }
 }
 
diff --git a/manifests/daemon/map_address.pp b/manifests/daemon/map_address.pp
index ac624a0..ca21ed9 100644
--- a/manifests/daemon/map_address.pp
+++ b/manifests/daemon/map_address.pp
@@ -1,14 +1,15 @@
 # map address definition
 define tor::daemon::map_address(
+  $ensure     = 'present',
   $address    = '',
   $newaddress = '',
-  $ensure     = 'present') {
-
-  concat::fragment { "08.map_address.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.map_address.erb'),
-    order   => '08',
-    target  => $tor::daemon::config_file,
+) {
+  if $ensure == 'present' {
+    concat::fragment { "08.map_address.${name}":
+      content => template('tor/torrc.map_address.erb'),
+      order   => '08',
+      target  => $tor::daemon::config_file,
+    }
   }
 }
 
diff --git a/manifests/daemon/onion_service.pp b/manifests/daemon/onion_service.pp
index 2625521..9d12a3a 100644
--- a/manifests/daemon/onion_service.pp
+++ b/manifests/daemon/onion_service.pp
@@ -1,6 +1,6 @@
 # onion services definition
 define tor::daemon::onion_service(
-  $ensure                 = present,
+  $ensure                 = 'present',
   $ports                  = [],
   $data_dir               = $tor::daemon::data_dir,
   $private_key            = undef,
@@ -9,16 +9,17 @@ define tor::daemon::onion_service(
 ) {
 
   $data_dir_path = "${data_dir}/${name}"
-  include ::tor::daemon::params
-  concat::fragment { "05.onion_service.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.onion_service.erb'),
-    order   => '05',
-    target  => $tor::daemon::config_file,
+  if $ensure == 'present' {
+    include ::tor::daemon::params
+    concat::fragment { "05.onion_service.${name}":
+      content => template('tor/torrc.onion_service.erb'),
+      order   => '05',
+      target  => $tor::daemon::config_file,
+    }
   }
   if $private_key or ($private_key_name and $private_key_store_path) {
     if $private_key and ($private_key_name and $private_key_store_path) {
-      fail("Either private_key OR (private_key_name AND private_key_store_path) must be set, but not all three of them")
+      fail('Either private_key OR (private_key_name AND private_key_store_path) must be set, but not all three of them')
     }
     if $private_key_store_path and $private_key_name {
       $tmp = generate_onion_key($private_key_store_path,$private_key_name)
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp
index 4fa303d..68e06ca 100644
--- a/manifests/daemon/relay.pp
+++ b/manifests/daemon/relay.pp
@@ -1,5 +1,6 @@
 # relay definition
 define tor::daemon::relay(
+  $ensure                  = 'present',
   $port                    = 0,
   $listen_addresses        = [],
   $outbound_bindaddresses  = [],
@@ -20,20 +21,21 @@ define tor::daemon::relay(
   $my_family               = '',
   $address                 = "tor.${::domain}",
   $bridge_relay            = 0,
-  $ensure                  = present ) {
+) {
 
-  $nickname = $name
+  if $ensure == 'present' {
+    $nickname = $name
 
-  if $outbound_bindaddresses == [] {
-    $real_outbound_bindaddresses = []
-  } else {
-    $real_outbound_bindaddresses = $outbound_bindaddresses
-  }
+    if $outbound_bindaddresses == [] {
+      $real_outbound_bindaddresses = []
+    } else {
+      $real_outbound_bindaddresses = $outbound_bindaddresses
+    }
 
-  concat::fragment { '03.relay':
-    ensure  => $ensure,
-    content => template('tor/torrc.relay.erb'),
-    order   => '03',
-    target  => $tor::daemon::config_file,
+    concat::fragment { '03.relay':
+      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 1f22d0c..195ed77 100644
--- a/manifests/daemon/snippet.pp
+++ b/manifests/daemon/snippet.pp
@@ -1,13 +1,15 @@
 # Arbitrary torrc snippet definition
 define tor::daemon::snippet(
+  $ensure  = 'present',
   $content = '',
-  $ensure  = present ) {
+) {
 
-  concat::fragment { "99.snippet.${name}":
-    ensure  => $ensure,
-    content => $content,
-    order   => '99',
-    target  => $tor::daemon::config_file,
+  if $ensure == 'present' {
+    concat::fragment { "99.snippet.${name}":
+      content => $content,
+      order   => '99',
+      target  => $tor::daemon::config_file,
+    }
   }
 }
 
diff --git a/manifests/daemon/socks.pp b/manifests/daemon/socks.pp
index 17ce40b..43256ae 100644
--- a/manifests/daemon/socks.pp
+++ b/manifests/daemon/socks.pp
@@ -2,8 +2,8 @@
 define tor::daemon::socks(
   $port = 0,
   $listen_addresses = [],
-  $policies = [] ) {
-
+  $policies = [],
+) {
   concat::fragment { '02.socks':
     content => template('tor/torrc.socks.erb'),
     order   => '02',
diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp
index 6ac7b44..49f9e70 100644
--- a/manifests/daemon/transparent.pp
+++ b/manifests/daemon/transparent.pp
@@ -1,14 +1,16 @@
 # Transparent proxy definition
 define tor::daemon::transparent(
+  $ensure           = 'present',
   $port             = 0,
   $listen_addresses = [],
-  $ensure           = present ) {
+) {
 
-  concat::fragment { "09.transparent.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.transparent.erb'),
-    order   => '09',
-    target  => $tor::daemon::config_file,
+  if $ensure == 'present' {
+    concat::fragment { "09.transparent.${name}":
+      content => template('tor/torrc.transparent.erb'),
+      order   => '09',
+      target  => $tor::daemon::config_file,
+    }
   }
 }
 
diff --git a/spec/defines/daemon_onion_service_spec.rb b/spec/defines/daemon_onion_service_spec.rb
index fba8efd..95be8c4 100644
--- a/spec/defines/daemon_onion_service_spec.rb
+++ b/spec/defines/daemon_onion_service_spec.rb
@@ -16,7 +16,6 @@ describe 'tor::daemon::onion_service', :type => 'define' do
     it { is_expected.to compile.with_all_deps }
 
     it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with(
-      :ensure  => 'present',
       :content => /HiddenServiceDir \/var\/lib\/tor\/test_os/,
       :order   => '05',
       :target  => '/etc/tor/torrc',
@@ -32,7 +31,6 @@ describe 'tor::daemon::onion_service', :type => 'define' do
       }
       it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with(
-        :ensure  => 'present',
         :content => /HiddenServiceDir \/var\/lib\/tor\/test_os/,
         :order   => '05',
         :target  => '/etc/tor/torrc',