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

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

diff --git a/.env.sample b/.env.sample
index d2dd7ac..9e5683b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -3,9 +3,7 @@ TYPE=invoiceninja
 DOMAIN=invoiceninja.swarm.autonomic.zone
 LETS_ENCRYPT_ENV=production
 
-NGINX_CONF_VERSION=v1
-
-API_SECRET_VERSION=v1
-APP_KEY_VERSION=v1
-DB_PASSWD_VERSION=v1
-DB_ROOT_PASSWD_VERSION=v1
+SECRET_API_SECRET_VERSION=v1
+SECRET_APP_KEY_VERSION=v1
+SECRET_DB_PASSWD_VERSION=v1
+SECRET_DB_ROOT_PASSWD_VERSION=v1
diff --git a/abra.sh b/abra.sh
new file mode 100644
index 0000000..0a5b1d5
--- /dev/null
+++ b/abra.sh
@@ -0,0 +1 @@
+export NGINX_CONF_VERSION=v1
diff --git a/compose.yml b/compose.yml
index e6e5798..cbe1214 100644
--- a/compose.yml
+++ b/compose.yml
@@ -86,16 +86,16 @@ networks:
 
 secrets:
   db_root_passwd:
-    name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWD_VERSION}
     external: true
   db_passwd:
-    name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWD_VERSION}
     external: true
   app_key:
-    name: ${STACK_NAME}_app_key_${APP_KEY_VERSION}
+    name: ${STACK_NAME}_app_key_${SECRET_APP_KEY_VERSION}
     external: true
   api_secret:
-    name: ${STACK_NAME}_api_secret_${API_SECRET_VERSION}
+    name: ${STACK_NAME}_api_secret_${SECRET_API_SECRET_VERSION}
     external: true
 
 configs: