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=5bc39853d397cec3e6147cb84e48c1bac4f9ac37;hpb=925ab8ddb02719ba2204a6207c540cc81399f2b0;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 5bc39853d..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,20 +4,38 @@ module Puppet::Parser::Functions
     hostname = args.shift()
     port = args.shift()
 
-    res = []
-    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 }
+    if port.kind_of?(Array)
+      ports = port
+    else
+      ports = [port]
+    end
+
+    if certfile.kind_of?(Array)
+      certs = certfile
     else
-      res << "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
+      certs = [ certfile ]
     end
 
-    certfile += ".new"
-    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| new_entry = i.read }
-      if not res.include?(new_entry)
-        res << new_entry
+    res = []
+    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
+
+        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