rename new cert files

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 310a77e0720223d90be39ec62c66f82cd7c5455d..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,8 +12,7 @@ module Puppet::Parser::Functions
       res << "; certfile #{certfile} did not exist to create TLSA record for #{hostname}:#{port}."
     end
 
       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 }
       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 }

diff --git a/modules/ssl/files/servicecerts/security-tracker.debian.org-new.crt b/modules/ssl/files/servicecerts/security-tracker.debian.org-new.crt
new file mode 100644 (file)
index 0000000..203aea4
--- /dev/null
+++ b/modules/ssl/files/servicecerts/security-tracker.debian.org-new.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDHzCCAgegAwIBAgIJALpdQlHYJDSyMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMMG3NlY3VyaXR5LXRyYWNrZXIuZGViaWFuLm9yZzAeFw0xMzA3MjkxOTM5MjJa
+Fw0xNDA3MjkxOTM5MjJaMCYxJDAiBgNVBAMMG3NlY3VyaXR5LXRyYWNrZXIuZGVi
+aWFuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOOkzy1q8KVH
+U3AxO8oLqHYGYMCy+wQgVJ8ufrgKk7yzbIQ9TdYDM9ER4xaPRL7Cwzv5PxV6N8Kq
+cZP+2YwHBZEyVj2yzvkjitZ8JsXR3ahghjCtAwIPTy2ff81cDp4EAMA2nJv8rAM0
+Uk7ewnXLol6W8+K82sL3MpFca6lpj0jY9GzSowro0zJsaEx2T0Q7cViPiBX6DQsR
+vss5dOfuFpPoVpLOdL8P5B4Y2Uk0PdLiGo/tw1OoyXGZBWAGHAHAWulJDVke9I6b
+Vmk3gf8WLgnitkofKGqsmrU5WBCMErczplLhKFYvKJJO9mMYDOtxoNrGedc749r9
+dO+uK2uo72UCAwEAAaNQME4wHQYDVR0OBBYEFGoncsaDaPkWQv423sHyxzZmsOgR
+MB8GA1UdIwQYMBaAFGoncsaDaPkWQv423sHyxzZmsOgRMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBALcwUS4dab8l5/EgkFPo8B2G/KYuhA5c8UXyozsT
+PTdxl1FHl7NHKhXn3AvWZEdGb0RBd4iHCHYDwsDp/wsjwaYimTaM4967x9IToRVG
+KRQx2CyzFXKEQcCljn1RlaPXPJvb6te1BsZPWGsGD4GRI8kvLsqBRkka7E30FkKG
+VaNkIGDM17ILNhaGFjkHQok8lIEvb90jDJnoLU710400XusqVg+YFK3u01Fub61n
+OE4z33t4ElLAFlGWUTJyAeqUERDLVsTJqCRepVWL8mYaJIvNwhQM2yOj4oPFNvp2
+KCoXBS0Tn+8Oak/xBVcAHARMnB69CuJ1VcSHapGH8F/+q38=
+-----END CERTIFICATE-----

diff --git a/modules/ssl/files/servicecerts/security-tracker.debian.org.crt.new b/modules/ssl/files/servicecerts/security-tracker.debian.org.crt.new
deleted file mode 100644 (file)
index 203aea4..0000000
--- a/modules/ssl/files/servicecerts/security-tracker.debian.org.crt.new
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJALpdQlHYJDSyMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMMG3NlY3VyaXR5LXRyYWNrZXIuZGViaWFuLm9yZzAeFw0xMzA3MjkxOTM5MjJa
-Fw0xNDA3MjkxOTM5MjJaMCYxJDAiBgNVBAMMG3NlY3VyaXR5LXRyYWNrZXIuZGVi
-aWFuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOOkzy1q8KVH
-U3AxO8oLqHYGYMCy+wQgVJ8ufrgKk7yzbIQ9TdYDM9ER4xaPRL7Cwzv5PxV6N8Kq
-cZP+2YwHBZEyVj2yzvkjitZ8JsXR3ahghjCtAwIPTy2ff81cDp4EAMA2nJv8rAM0
-Uk7ewnXLol6W8+K82sL3MpFca6lpj0jY9GzSowro0zJsaEx2T0Q7cViPiBX6DQsR
-vss5dOfuFpPoVpLOdL8P5B4Y2Uk0PdLiGo/tw1OoyXGZBWAGHAHAWulJDVke9I6b
-Vmk3gf8WLgnitkofKGqsmrU5WBCMErczplLhKFYvKJJO9mMYDOtxoNrGedc749r9
-dO+uK2uo72UCAwEAAaNQME4wHQYDVR0OBBYEFGoncsaDaPkWQv423sHyxzZmsOgR
-MB8GA1UdIwQYMBaAFGoncsaDaPkWQv423sHyxzZmsOgRMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBALcwUS4dab8l5/EgkFPo8B2G/KYuhA5c8UXyozsT
-PTdxl1FHl7NHKhXn3AvWZEdGb0RBd4iHCHYDwsDp/wsjwaYimTaM4967x9IToRVG
-KRQx2CyzFXKEQcCljn1RlaPXPJvb6te1BsZPWGsGD4GRI8kvLsqBRkka7E30FkKG
-VaNkIGDM17ILNhaGFjkHQok8lIEvb90jDJnoLU710400XusqVg+YFK3u01Fub61n
-OE4z33t4ElLAFlGWUTJyAeqUERDLVsTJqCRepVWL8mYaJIvNwhQM2yOj4oPFNvp2
-KCoXBS0Tn+8Oak/xBVcAHARMnB69CuJ1VcSHapGH8F/+q38=
------END CERTIFICATE-----