From 8cb7bed81e39ef8174ce1b8e7a3c484384a70131 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Mon, 8 Feb 2021 15:34:39 +0200
Subject: [PATCH] Move config to abra.sh, add SECRET to secrets

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

diff --git a/.env.sample b/.env.sample
index 84d394e..6389989 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,8 +9,6 @@ LETS_ENCRYPT_ENV=production
 ADMIN_USERNAME=admin
 ADMIN_EMAIL=rocketchat@example.com
 
-ENTRYPOINT_CONF_VERSION=v1
-
 # OAuth with Keycloak
 #COMPOSE_FILE="compose.yml:compose.oauth.yml"
 #Accounts_OAuth_Custom-Keycloak-url="https://id.example.com/auth"
@@ -19,7 +17,7 @@ ENTRYPOINT_CONF_VERSION=v1
 #Accounts_OAuth_Custom-Keycloak-authorize_path="/realms/realmname/protocol/openid-connect/auth"
 #Accounts_OAuth_Custom-Keycloak-id="rocketchat"
 
-#OAUTH_KEY_VERSION=v1
+#SECRET_OAUTH_KEY_VERSION=v1
 
 # SMTP
 #COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
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 adf93fe..d81a37b 100644
--- a/compose.oauth.yml
+++ b/compose.oauth.yml
@@ -26,4 +26,4 @@ services:
 secrets:
   oauth_key:    
     external: true 
-    name: ${STACK_NAME}_oauth_key_${OAUTH_KEY_VERSION}
+    name: ${STACK_NAME}_oauth_key_${SECRET_OAUTH_KEY_VERSION}