diff --git a/Makefile b/Makefile index c57dd0b..3cc87eb 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,7 @@ endif edit-vars: EDITOR=micro \ - ansible-vault edit \ - --vault-password-file="ansible-vault-password-file" \ - ansible/vars/vars.yml + ansible-vault edit ansible/vars/vars.yml configure: ANSIBLE_HOST_KEY_CHECKING=$(ANSIBLE_HOST_KEY_CHECKING) \ @@ -38,7 +36,6 @@ configure: $(TAGS_ARGS) \ --inventory="$(INVENTORY)" \ --extra-vars='ansible_python_interpreter=/usr/bin/python3' \ - --vault-password-file="ansible-vault-password-file" \ $(PLAYBOOK) configure-prod: @@ -54,7 +51,6 @@ dry-run: $(TAGS_ARGS) \ --inventory="$(INVENTORY)" \ --extra-vars='ansible_python_interpreter=/usr/bin/python3' \ - --vault-password-file="ansible-vault-password-file" \ --check \ --diff -vvv \ $(PLAYBOOK) @@ -62,7 +58,6 @@ dry-run: list-tags: ansible-playbook \ --inventory="$(INVENTORY)" \ - --vault-password-file="ansible-vault-password-file" \ --list-tags \ $(PLAYBOOK) diff --git a/ansible-vault-password-file.dist b/ansible-vault-password-file.dist new file mode 100644 index 0000000..9e20737 --- /dev/null +++ b/ansible-vault-password-file.dist @@ -0,0 +1 @@ + diff --git a/ansible.cfg b/ansible.cfg index 935d32b..326d2fc 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,2 +1,3 @@ [defaults] -roles_path = ./ansible/galaxy.roles +roles_path = ./ansible/galaxy.roles +vault_password_file = ./ansible-vault-password-file