From 828f9a899d4e7bd84d68ecdc1ecf21604a9034da Mon Sep 17 00:00:00 2001
From: Patrik Lundin <patlu@sunet.se>
Date: Tue, 8 Oct 2024 09:51:08 +0200
Subject: [PATCH] Fix templates for passwords

---
 global/overlay/etc/puppet/modules/cdn/manifests/ca.pp         | 4 ++--
 .../etc/puppet/modules/cdn/templates/ca/key-password.erb      | 1 +
 .../overlay/etc/puppet/modules/cdn/templates/ca/password.erb  | 1 -
 .../puppet/modules/cdn/templates/ca/provisioner-password.erb  | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 global/overlay/etc/puppet/modules/cdn/templates/ca/key-password.erb
 delete mode 100644 global/overlay/etc/puppet/modules/cdn/templates/ca/password.erb
 create mode 100644 global/overlay/etc/puppet/modules/cdn/templates/ca/provisioner-password.erb

diff --git a/global/overlay/etc/puppet/modules/cdn/manifests/ca.pp b/global/overlay/etc/puppet/modules/cdn/manifests/ca.pp
index 5708d0a..cca6f81 100644
--- a/global/overlay/etc/puppet/modules/cdn/manifests/ca.pp
+++ b/global/overlay/etc/puppet/modules/cdn/manifests/ca.pp
@@ -42,7 +42,7 @@ class cdn::ca(
         owner  => '1000',
         group  => '1000',
         mode   => '0640',
-        content => template('cdn/ca/password.erb'),
+        content => template('cdn/ca/key-password.erb'),
       }
     }
 
@@ -52,7 +52,7 @@ class cdn::ca(
         owner  => '1000',
         group  => '1000',
         mode   => '0640',
-        content => template('cdn/ca/password.erb'),
+        content => template('cdn/ca/provisioner-password.erb'),
       }
     }
   }
diff --git a/global/overlay/etc/puppet/modules/cdn/templates/ca/key-password.erb b/global/overlay/etc/puppet/modules/cdn/templates/ca/key-password.erb
new file mode 100644
index 0000000..59dbe86
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/cdn/templates/ca/key-password.erb
@@ -0,0 +1 @@
+<%= @ca_secrets['key_password'] %>
diff --git a/global/overlay/etc/puppet/modules/cdn/templates/ca/password.erb b/global/overlay/etc/puppet/modules/cdn/templates/ca/password.erb
deleted file mode 100644
index 7d084d9..0000000
--- a/global/overlay/etc/puppet/modules/cdn/templates/ca/password.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @private_key_password %>
diff --git a/global/overlay/etc/puppet/modules/cdn/templates/ca/provisioner-password.erb b/global/overlay/etc/puppet/modules/cdn/templates/ca/provisioner-password.erb
new file mode 100644
index 0000000..f15f310
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/cdn/templates/ca/provisioner-password.erb
@@ -0,0 +1 @@
+<%= @ca_secrets['provisioner_password'] %>