From 572b08c4a7aa534f1ed249fc4ae87ae467966430 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Mon, 11 Jan 2021 13:08:04 +0100
Subject: Cleaning up gitignores.

---
 .gitignore             | 2 +-
 .settings.sh           | 4 ++--
 bin/.gitignore         | 8 +++++++-
 terraform/.gitignore   | 1 -
 terraform/.settings.sh | 1 -
 5 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 terraform/.settings.sh

diff --git a/.gitignore b/.gitignore
index d32ecb8..e99d1cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 secrets/
 .terraform
-.settings-vault
+.vault
diff --git a/.settings.sh b/.settings.sh
index b8ecb8a..b61e32a 100644
--- a/.settings.sh
+++ b/.settings.sh
@@ -6,12 +6,12 @@ basedir=$(cd "$basedir" && pwd)
 echo "Adding bin/ to path"
 PATH="$basedir/bin:$PATH"
 
-if [[ ! -r .settings-vault ]]
+if [[ ! -r .vault ]]
 then
   echo "Missing .settings-vault"
 else
   echo "Loading secrets"
-  source <(cd $basedir/ansible; ansible-vault view ../.settings-vault)
+  source <(cd $basedir/ansible; ansible-vault view ../.vault)
 fi
 
 alias terraform="ANSIBLE_VAULT_PASS=\$($(pwd)/ansible/.vault-password) $basedir/bin/terraform"
diff --git a/bin/.gitignore b/bin/.gitignore
index ba077a4..af71bf2 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,7 @@
-bin
+dhall-[0-9].*
+dhall-json-[0-9].*
+dhall-to-json-[0-9].*
+dhall-to-yaml-[0-9].*
+dhall-to-yaml-ng-[0-9].*
+dhall-yaml-[0-9].*
+yaml-to-dhall-[0-9].*
diff --git a/terraform/.gitignore b/terraform/.gitignore
index 5458a76..c2169b6 100644
--- a/terraform/.gitignore
+++ b/terraform/.gitignore
@@ -1,3 +1,2 @@
 .terraform
 terraform.d
-state/
diff --git a/terraform/.settings.sh b/terraform/.settings.sh
deleted file mode 100644
index dcbb42e..0000000
--- a/terraform/.settings.sh
+++ /dev/null
@@ -1 +0,0 @@
-alias terraform="ANSIBLE_VAULT_PASS=\$($(pwd)/../ansible/.vault-password) $(pwd)/.terraform/bin/terraform"
-- 
cgit v1.2.3