From 247a7135db401f712d81890846ed162c2b08b5bc Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Mon, 8 Feb 2021 15:07:58 +0200
Subject: [PATCH] Move conf to abra.sh, add SECRET_ to secret names

Ref coop-cloud/abra#43
---
 .env.sample       | 5 ++---
 abra.sh           | 1 +
 compose.oauth.yml | 2 +-
 compose.yml       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 abra.sh

diff --git a/.env.sample b/.env.sample
index 33b135a..0aa99e4 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,8 +5,7 @@ DOMAIN=codimd.example.com
 #EXTRA_DOMAINS=', `www.codimd.example.com`'
 LETS_ENCRYPT_ENV=production
 
-DB_ROOT_PASSWORD_VERSION=v1
-ENTRYPOINT_CONF_VERSION=v1
+SECRET_DB_ROOT_PASSWORD_VERSION=v1
 
 # OAuth, see https://hackmd.io/@codimd/codimd-generic-oauth-2
 
@@ -18,4 +17,4 @@ ENTRYPOINT_CONF_VERSION=v1
 #CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
 #CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
 #
-#OAUTH_KEY_VERSION=v1
+#SECRET_OAUTH_KEY_VERSION=v1
diff --git a/abra.sh b/abra.sh
new file mode 100644
index 0000000..5c54e9d
--- /dev/null
+++ b/abra.sh
@@ -0,0 +1 @@
+export ENTRYPOINT_CONF_VERSION=v1
diff --git a/compose.oauth.yml b/compose.oauth.yml
index 656296d..05d2dd6 100644
--- a/compose.oauth.yml
+++ b/compose.oauth.yml
@@ -18,4 +18,4 @@ services:
 secrets:
   oauth_key:    
     external: true 
-    name: ${STACK_NAME}_oauth_key_${OAUTH_KEY_VERSION}
+    name: ${STACK_NAME}_oauth_key_${SECRET_OAUTH_KEY_VERSION}
diff --git a/compose.yml b/compose.yml
index 45c501c..4c899df 100644
--- a/compose.yml
+++ b/compose.yml
@@ -66,7 +66,7 @@ volumes:
 secrets:
   db_password:    
     external: true 
-    name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
 
 networks:
   proxy: