variable assignment does not clone string...

[dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / gen_tlsa_entry.rb

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 7c07b7c9fcf5d5b978821ef7eb4ad7e373a6a27f..1257ae81c9731d5889e9f698b64403bae39bdc5e 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
@@ -4,13 +4,33 @@ module Puppet::Parser::Functions
     hostname = args.shift()
     port = args.shift()
 
-    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|
-        return i.read
-      }
+    if port.kind_of?(Array)
+      ports = port
     else
-      return "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
+      ports = [port]
     end
+
+    res = []
+    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
+
+    return res.join("\n")
   end
 end