rename new cert files

[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 5bc39853d397cec3e6147cb84e48c1bac4f9ac37..7b846b90c327ba98c59ae792b3c26ec17438b27e 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_tlsa_entry.rb
@@ -12,9 +12,9 @@ module Puppet::Parser::Functions
       res << "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
     end
 
-    certfile += ".new"
-    if File.exist?(certfile)
+    if certfile.gsub!(/\.crt$/, '-new.crt') and File.exist?(certfile)
       cmd = ['swede', 'create', '--usage=3', '--selector=1', '--mtype=1', '--certificate', certfile, '--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