From 1fcbe72115d57d53fced2777c8b54a4ee4ec17e9 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 30 Aug 2017 18:30:12 +0200
Subject: make it work with newer concat module

---
 manifests/daemon/relay.pp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'manifests/daemon/relay.pp')

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