From 9e4ccfd04154e1d5d4b18ad74fea3d06027772a8 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 2 Nov 2020 18:07:53 +0100
Subject: [PATCH] Matach up secrets with PASSWORD style

---
 .envrc.sample |  8 ++++----
 compose.yml   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.envrc.sample b/.envrc.sample
index e9f0491..27ffe28 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -37,10 +37,10 @@ export SMTP_USER_NAME=foodsoft
 export SMTP_SERVER_PORT=2525
 export SMTP_SERVER_HOST=mail.autonomic.zone
 
-export SECRET_DB_PASSWD_VERSION=v1
-export SECRET_DB_ROOT_PASSWD_VERSION=v1
-export SECRET_SHARED_LISTS_DB_PASSWD_VERSION=v1
-export SECRET_SMTP_PASSWD_VERSION=v1
+export SECRET_DB_PASSWORD_VERSION=v1
+export SECRET_DB_ROOT_PASSWORD_VERSION=v1
+export SECRET_SHARED_LISTS_DB_PASSWORD_VERSION=v1
+export SECRET_SMTP_PASSWORD_VERSION=v1
 export SECRET_KEY_BASE_VERSION=v1
 
 export APP_CONFIG_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 37aa2b8..006289b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -131,21 +131,21 @@ configs:
     template_driver: golang
   entrypoint:
     name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
-    file: entrypoint.yml.tmpl
+    file: entrypoint.sh.tmpl
     template_driver: golang
 
 secrets:
   db_passwd:
-    name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION}
     external: true
   db_root_passwd:
-    name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION}
     external: true
   shared_lists_db_passwd:
-    name: ${STACK_NAME}_shared_lists_db_passwd_${SHARED_LISTS_DB_PASSWD_VERSION}
+    name: ${STACK_NAME}_shared_lists_db_passwd_${SECRET_SHARED_LISTS_DB_PASSWORD_VERSION}
     external: true
   smtp_passwd:
-    name: ${STACK_NAME}_smtp_password_${SMTP_PASSWD_VERSION}
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
     external: true
   secret_key_base:
     name: ${STACK_NAME}_secret_key_base_${SECRET_KEY_BASE_VERSION}