aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2022-12-23 09:05:00 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2022-12-23 09:05:00 +0100
commit3fc34994497058635777df5b048eac980d6b4d4b (patch)
tree68408a56131d00196604447a9a27387e54e74171
parent178f908191079d8c68225736c433370258035147 (diff)
downloadinfra-3fc34994497058635777df5b048eac980d6b4d4b.tar.gz
infra-3fc34994497058635777df5b048eac980d6b4d4b.tar.bz2
infra-3fc34994497058635777df5b048eac980d6b4d4b.tar.xz
infra-3fc34994497058635777df5b048eac980d6b4d4b.zip
Better .settings.sh
-rw-r--r--.settings.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/.settings.sh b/.settings.sh
index 9967ba6..020dcbd 100644
--- a/.settings.sh
+++ b/.settings.sh
@@ -3,6 +3,8 @@
basedir=$(dirname "$_")
basedir=$(cd "$basedir" && pwd)
+export ANSIBLE_CONFIG=$basedir/ansible/ansible.cfg
+
echo "Adding bin/ to path"
PATH="$basedir/bin:$PATH"
@@ -11,11 +13,9 @@ then
echo "Missing .vault"
else
echo "Loading secrets"
- source <(cd $basedir/ansible; ansible-vault view ../.vault)
+ source <(ansible-vault view $basedir/.vault)
fi
-export ANSIBLE_CONFIG=$basedir/ansible.cfg
-
if [[ -x $basedir/ansible/.vault-password ]]
then
export ANSIBLE_VAULT_PASS=$($basedir/ansible/.vault-password)