From deda09296647f53f19926dcc50d0858f6ede6820 Mon Sep 17 00:00:00 2001
From: Javielico <javielico@riseup.net>
Date: Mon, 26 Aug 2024 16:11:52 +0100
Subject: [PATCH] Messing around with config

---
 .env.sample | 11 +++--------
 abra.sh     |  8 +++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.env.sample b/.env.sample
index 8abb975..60f81d5 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,20 +1,15 @@
 TYPE=miniflux
 
-# Miniflux Configuration
-DOMAIN=miniflux.example.org
-
-# Database Configuration
+DOMAIN=rss.example.com
 DB_NAME=miniflux
 DB_USER=miniflux
-
-# Admin User Configuration
 MINIFLUX_ADMIN_USERNAME=admin
 
-# Secrets
+# Secret Versions
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_ADMIN_PASSWORD_VERSION=v1
 SECRET_KEY_VERSION=v1
 
-# Configurations
+# Config Versions
 CONFIG_VERSION=v1
 STACK_NAME=miniflux
diff --git a/abra.sh b/abra.sh
index 9682173..7b2e3fc 100644
--- a/abra.sh
+++ b/abra.sh
@@ -2,9 +2,11 @@
 
 STACK_NAME=miniflux
 CONFIG_VERSION=v1
-SECRET_DB_PASSWORD_VERSION=${SECRET_DB_PASSWORD_VERSION}
-SECRET_ADMIN_PASSWORD_VERSION=${SECRET_ADMIN_PASSWORD_VERSION}
-SECRET_KEY_VERSION=${SECRET_KEY_VERSION}
+
+# Set default versions if not already set
+SECRET_DB_PASSWORD_VERSION=${SECRET_DB_PASSWORD_VERSION:-v1}
+SECRET_ADMIN_PASSWORD_VERSION=${SECRET_ADMIN_PASSWORD_VERSION:-v1}
+SECRET_KEY_VERSION=${SECRET_KEY_VERSION:-v1}
 
 abra deploy \
   --stack $STACK_NAME \