From a5b2eb5f97a9360e933cc79c59739dca569ebbb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kip.pe>
Date: Fri, 21 Oct 2022 10:49:02 +0200
Subject: [PATCH] Move borg credentials to a separate file

To be used from a service
---
 site-cookbooks/kosmos_kvm/recipes/backup.rb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/site-cookbooks/kosmos_kvm/recipes/backup.rb b/site-cookbooks/kosmos_kvm/recipes/backup.rb
index 64dbd08..8c97576 100644
--- a/site-cookbooks/kosmos_kvm/recipes/backup.rb
+++ b/site-cookbooks/kosmos_kvm/recipes/backup.rb
@@ -12,16 +12,24 @@ file "/root/.ssh/borg_rsa" do
   mode '0600'
 end
 
-bash "Add borg environment variables for bash" do
+file "/root/.borg_credentials.env" do
+  content <<-EOF
+BORG_RSH='ssh -i /root/.ssh/borg_rsa'
+BORG_PASSPHRASE=#{borg_credentials["passphrase"]}
+BORG_REPO='#{borg_credentials["repository"]}'
+  EOF
+end
+
+bash "Load borg credentials in console sessions" do
   code <<-EOF
           cat >>/root/.bashrc <<EOL
 
 # GENERATED BY CHEF
-export BORG_RSH='ssh -i /root/.ssh/borg_rsa'
-export BORG_PASSPHRASE=#{borg_credentials["passphrase"]}
-export BORG_REPO='#{borg_credentials["repository"]}'
+set -o allexport
+source ~/.borg_credentials.env
+set +o allexport
   EOF
-  not_if "grep -q BORG /root/.bashrc"
+  not_if "grep -q borg_credentials /root/.bashrc"
 end
 
 directory "/root/backups" do