From 711b81dd99f1d6b69cf67d3db463ecd4c55f642d Mon Sep 17 00:00:00 2001
From: cspark <git@cspark.dev>
Date: Mon, 25 Mar 2024 17:58:10 +0000
Subject: [PATCH] edit the host-ansible-conf helper scripts to use  envvar
 instead of the templated var

---
 home_resources/.bashrc                              | 2 ++
 home_resources/.local/bin/spark_ansible-playbook.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/home_resources/.bashrc b/home_resources/.bashrc
index 1a926a9..f309202 100644
--- a/home_resources/.bashrc
+++ b/home_resources/.bashrc
@@ -116,6 +116,8 @@ fi
 
 export PATH="/usr/sbin:${PATH}"
 
+export ANSIBLECONF_DIR="{{ ansibleconf_directory }}"
+
 export EDITOR=vim
 
 # To fix weird terminal behaviour when in SSH
diff --git a/home_resources/.local/bin/spark_ansible-playbook.sh b/home_resources/.local/bin/spark_ansible-playbook.sh
index a40ef63..5d2afc6 100755
--- a/home_resources/.local/bin/spark_ansible-playbook.sh
+++ b/home_resources/.local/bin/spark_ansible-playbook.sh
@@ -25,14 +25,14 @@ if [ -e $USBKEYVAR ]; then
 	fi
 	if [[ "$FILENAME" == *"server"* ]]; then
 		echo "Detected as a server playbook file, decrypting accordingly..."
-		if ansible-playbook -e @{{ ansibleconf_directory }}/serversecrets.enc --vault-password-file $USBKEYSLOCATION/serversecrets $ABSOLUTELOCATION; then
+		if ansible-playbook -e @$ANSIBLECONF_DIR/serversecrets.enc --vault-password-file $USBKEYSLOCATION/serversecrets $ABSOLUTELOCATION; then
 			echo "Ansible Playbook success!"
 		else
 			echo "Ansible Playbook failure!"
 		fi
 	elif [[ "$FILENAME" == *"service"* ]]; then
 		echo "Detected as a service playbook file, decrypting accordingly..."
-		if ansible-playbook -e @{{ ansibleconf_directory }}/serversecrets.enc --vault-password-file $USBKEYSLOCATION/serversecrets -e @{{ ansibleconf_directory }}/services/$FILEPARENTDIR/servicesecrets.enc --vault-password-file $USBKEYSLOCATION/servicesecrets $ABSOLUTELOCATION; then
+		if ansible-playbook -e @$ANSIBLECONF_DIR/serversecrets.enc --vault-password-file $USBKEYSLOCATION/serversecrets -e @$ANSIBLECONF_DIR/services/$FILEPARENTDIR/servicesecrets.enc --vault-password-file $USBKEYSLOCATION/servicesecrets $ABSOLUTELOCATION; then
 			echo "Ansible Playbook success!"
 		else
 			echo "Ansible Playbook failure!"