From a57b39ec76b615ecdf580a8100b31e762309f76f Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Thu, 11 Aug 2022 22:16:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D1=81=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=B5=D0=BC=20vault=20=D0=B2=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                         | 7 +------
 ansible-vault-password-file.dist | 1 +
 ansible.cfg                      | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 ansible-vault-password-file.dist

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 @@
+<vault-password-here>
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