From: Peter Palfrader Date: Thu, 5 Nov 2015 19:27:06 +0000 (+0100) Subject: Give arrays another try X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d32b5ca2040af0e861851c5519aa5ff5b7887768;p=mirror%2Fdsa-puppet.git Give arrays another try --- diff --git a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb index f49555c72..baaa73b4d 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb @@ -4,10 +4,10 @@ module Puppet::Parser::Functions hostname = args.shift() port = args.shift() - if port.kind_of?(String) - ports = port.split() - else + if port.kind_of?(Array) ports = port + else + ports = [port] end res = [] diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp index 09ad05806..4a9a30350 100644 --- a/modules/roles/manifests/rtc.pp +++ b/modules/roles/manifests/rtc.pp @@ -10,7 +10,7 @@ class roles::rtc { dnsextras::tlsa_record{ 'tlsa-xmpp': zone => 'debian.org', certfile => "/etc/puppet/modules/ssl/files/servicecerts/www.debian.org.crt", - port => '5061 5222 5269', + port => [5061, 5222, 5269], hostname => $::fqdn, }