From 849eb43df108d9cd59277bb7958698f3bf3bf409 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 18 Jul 2016 17:04:44 +0200
Subject: [PATCH] Put vault-password-file setting into ansible.cfg

Uhm, yeah. Forget I ever created a wrapper for that...

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 ansible                 |  1 -
 ansible-command-wrapper | 15 ---------------
 ansible-playbook        |  1 -
 ansible-vault           |  1 -
 ansible.cfg             |  1 +
 5 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 120000 ansible
 delete mode 100755 ansible-command-wrapper
 delete mode 120000 ansible-playbook
 delete mode 120000 ansible-vault

diff --git a/ansible b/ansible
deleted file mode 120000
index e4e1b37cb..000000000
--- a/ansible
+++ /dev/null
@@ -1 +0,0 @@
-ansible-command-wrapper
\ No newline at end of file
diff --git a/ansible-command-wrapper b/ansible-command-wrapper
deleted file mode 100755
index 80663fc0f..000000000
--- a/ansible-command-wrapper
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-command=$(basename "$0")
-
-if [[ $command = "ansible-command-wrapper" ]]; then
-	if [[ $# -gt 0 ]]; then
-		command=$1
-		shift
-	else
-		echo "usage: ansible-command-wrapper <command name> [arguments]" >&2
-		exit 1
-	fi
-fi
-
-exec "$command" --vault-password-file $(dirname $0)/misc/get-vault-pass.sh "$@"
diff --git a/ansible-playbook b/ansible-playbook
deleted file mode 120000
index e4e1b37cb..000000000
--- a/ansible-playbook
+++ /dev/null
@@ -1 +0,0 @@
-ansible-command-wrapper
\ No newline at end of file
diff --git a/ansible-vault b/ansible-vault
deleted file mode 120000
index e4e1b37cb..000000000
--- a/ansible-vault
+++ /dev/null
@@ -1 +0,0 @@
-ansible-command-wrapper
\ No newline at end of file
diff --git a/ansible.cfg b/ansible.cfg
index f4ff5c04a..a93ec4011 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -7,6 +7,7 @@ gathering = implicit
 remote_user = root
 nocows = 1
 roles_path = roles
+vault_password_file = misc/get-vault-pass.sh
 
 [ssh_connection]
 pipelining = True
-- 
GitLab