From 4d1a5f8786bc4a3b3413acd853c58ce31350d25c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 31 Jan 2024 11:15:14 +0100
Subject: [PATCH] Adapt vault cleanups

---
 .../{vault-vaultwarden => vault-database}     |  0
 example/prep.d/10-mv_conf.sh                  | 19 -------------------
 init/vault-database                           |  5 +++++
 init/vault-vaultwarden                        |  8 --------
 prep.d/10-mv_conf.sh                          |  1 -
 5 files changed, 5 insertions(+), 28 deletions(-)
 rename example/init/{vault-vaultwarden => vault-database} (100%)
 delete mode 100755 example/prep.d/10-mv_conf.sh
 create mode 100755 init/vault-database
 delete mode 100755 init/vault-vaultwarden
 delete mode 100755 prep.d/10-mv_conf.sh

diff --git a/example/init/vault-vaultwarden b/example/init/vault-database
similarity index 100%
rename from example/init/vault-vaultwarden
rename to example/init/vault-database
diff --git a/example/prep.d/10-mv_conf.sh b/example/prep.d/10-mv_conf.sh
deleted file mode 100755
index c2a26cb..0000000
--- a/example/prep.d/10-mv_conf.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-
-
-if [ "vaultwarden" != "vaultwarden" ]; then
-  for DIR in vault consul nomad; do
-    if [ -d output/${DIR} ]; then
-      for FILE in $(find output/${DIR} -name "*vaultwarden*.hcl" -type f); do
-        NEW_FILE=$(echo "${FILE}" | sed -E "s/vaultwarden/vaultwarden/g")
-        mv "${FILE}" "${NEW_FILE}"
-      done
-    fi
-  done
-fi
-
-
-
diff --git a/init/vault-database b/init/vault-database
new file mode 100755
index 0000000..1833506
--- /dev/null
+++ b/init/vault-database
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -euo pipefail
+
+[[ template "common/vault.mkpgrole.sh.tpl" merge .vaultwarden.server . ]]
diff --git a/init/vault-vaultwarden b/init/vault-vaultwarden
deleted file mode 100755
index c3cb7c3..0000000
--- a/init/vault-vaultwarden
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -euo pipefail
-
-[[- template "common/vault.mkpgrole.sh.tpl"
-  dict "ctx" .
-       "config" (dict "role" .instance "database" "postgres")
-]]
diff --git a/prep.d/10-mv_conf.sh b/prep.d/10-mv_conf.sh
deleted file mode 100755
index eb8431b..0000000
--- a/prep.d/10-mv_conf.sh
+++ /dev/null
@@ -1 +0,0 @@
-[[ template "common/mv_conf.sh" dict "ctx" . "services" (dict "vaultwarden" .instance) ]]