X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fgen_tlsa_entry.rb;h=e2d0a60264f0c85a63c901a6f71d408bcaebbd22;hb=377414d029f76cd4bd9940e0bdf392cdbb852c40;hp=9a65a5b7482965420ff00ccced1cd1428706d589;hpb=1a6e21d366bf5f8feab36ab1a214598085ae82eb;p=mirror%2Fdsa-puppet.git

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 9a65a5b74..e2d0a6026 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
@@ -4,32 +4,40 @@ 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
+
+    if certfile.kind_of?(Array)
+      certs = certfile
+    else
+      certs = [ certfile ]
     end
 
     res = []
-    res << "; cert #{certfile} for #{hostname}:#{port}."
-    ports.each{ |port|
-      cf = certfile
-      if File.exist?(cf)
-        cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', cf, '--port', port.to_s, hostname]
-        IO.popen(cmd, "r") {|i| res << i.read }
-      else
-        res << "; certfile #{cf} did not exist to create TLSA record for #{hostname}:#{port}."
-      end
+    certs.each do |certfile|
+      res << "; cert #{certfile} for #{hostname}:#{ports}."
+      ports.each do |port|
+        if File.exist?(certfile)
+          cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', certfile, '--port', port.to_s, hostname]
+          IO.popen(cmd, "r") {|i| res << i.read }
+        else
+          res << "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
+        end
 
-      if cf.gsub!(/\.crt$/, '-new.crt') and File.exist?(cf)
-        cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', cf, '--port', port.to_s, hostname]
-        new_entry = ''
-        IO.popen(cmd, "r") {|i| new_entry = i.read }
-        if not res.include?(new_entry)
-          res << new_entry
+        cfnew = certfile.gsub(/\.crt$/, '-new.crt')
+        if cfnew != certfile and File.exist?(cfnew)
+          cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', cfnew, '--port', port.to_s, hostname]
+          new_entry = ''
+          IO.popen(cmd, "r") {|i| new_entry = i.read }
+          if not res.include?(new_entry)
+            res << new_entry
+          end
         end
       end
-    }
+    end
 
     return res.join("\n")
   end