From 31864449acde7466380505ae7ca58961fd4195a0 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 7 Nov 2023 17:54:44 +0100 Subject: [PATCH] fixup! Unify HTTP server creation --- jobs/metricsforwarder/templates/metricsforwarder.crt.erb | 3 --- jobs/metricsforwarder/templates/metricsforwarder.key.erb | 3 --- jobs/metricsforwarder/templates/metricsforwarder_ca.crt.erb | 2 +- .../metricsforwarder/templates/metricsforwarder_server.crt.erb | 3 +++ .../metricsforwarder/templates/metricsforwarder_server.key.erb | 3 +++ 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 jobs/metricsforwarder/templates/metricsforwarder.crt.erb delete mode 100644 jobs/metricsforwarder/templates/metricsforwarder.key.erb create mode 100644 jobs/metricsforwarder/templates/metricsforwarder_server.crt.erb create mode 100644 jobs/metricsforwarder/templates/metricsforwarder_server.key.erb diff --git a/jobs/metricsforwarder/templates/metricsforwarder.crt.erb b/jobs/metricsforwarder/templates/metricsforwarder.crt.erb deleted file mode 100644 index 661720b8ea..0000000000 --- a/jobs/metricsforwarder/templates/metricsforwarder.crt.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% if_p("autoscaler.metricsforwarder.health.server_cert") do |value| %> -<%= value %> -<% end %> \ No newline at end of file diff --git a/jobs/metricsforwarder/templates/metricsforwarder.key.erb b/jobs/metricsforwarder/templates/metricsforwarder.key.erb deleted file mode 100644 index 6b295aeee4..0000000000 --- a/jobs/metricsforwarder/templates/metricsforwarder.key.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% if_p("autoscaler.metricsforwarder.health.server_key") do |value| %> -<%= value %> -<% end %> \ No newline at end of file diff --git a/jobs/metricsforwarder/templates/metricsforwarder_ca.crt.erb b/jobs/metricsforwarder/templates/metricsforwarder_ca.crt.erb index 258983f9bc..cd9854785d 100644 --- a/jobs/metricsforwarder/templates/metricsforwarder_ca.crt.erb +++ b/jobs/metricsforwarder/templates/metricsforwarder_ca.crt.erb @@ -1,3 +1,3 @@ -<% if_p("autoscaler.metricsforwarder.health.ca_cert") do |value| %> +<% if_p("autoscaler.metricsforwarder.server.ca_cert") do |value| %> <%= value %> <% end %> \ No newline at end of file diff --git a/jobs/metricsforwarder/templates/metricsforwarder_server.crt.erb b/jobs/metricsforwarder/templates/metricsforwarder_server.crt.erb new file mode 100644 index 0000000000..5e86c5a929 --- /dev/null +++ b/jobs/metricsforwarder/templates/metricsforwarder_server.crt.erb @@ -0,0 +1,3 @@ +<% if_p("autoscaler.metricsforwarder.server.server_cert") do |value| %> +<%= value %> +<% end %> \ No newline at end of file diff --git a/jobs/metricsforwarder/templates/metricsforwarder_server.key.erb b/jobs/metricsforwarder/templates/metricsforwarder_server.key.erb new file mode 100644 index 0000000000..0918526bb4 --- /dev/null +++ b/jobs/metricsforwarder/templates/metricsforwarder_server.key.erb @@ -0,0 +1,3 @@ +<% if_p("autoscaler.metricsforwarder.server.server_key") do |value| %> +<%= value %> +<% end %> \ No newline at end of file