diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2021-01-11 13:08:04 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2021-01-11 14:15:17 +0100 |
| commit | 572b08c4a7aa534f1ed249fc4ae87ae467966430 (patch) | |
| tree | eaa232c63b45c5f9283e43f6a6bbc03a5f0196f7 | |
| parent | dcf9d7e3efbbe791db1a21de1dd21abf2ff22f81 (diff) | |
| download | infra-572b08c4a7aa534f1ed249fc4ae87ae467966430.tar.gz infra-572b08c4a7aa534f1ed249fc4ae87ae467966430.tar.bz2 infra-572b08c4a7aa534f1ed249fc4ae87ae467966430.tar.xz infra-572b08c4a7aa534f1ed249fc4ae87ae467966430.zip | |
Cleaning up gitignores.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .settings.sh | 4 | ||||
| -rw-r--r-- | bin/.gitignore | 8 | ||||
| -rw-r--r-- | terraform/.gitignore | 1 | ||||
| -rw-r--r-- | terraform/.settings.sh | 1 |
5 files changed, 10 insertions, 6 deletions
@@ -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" |