From 77b5d287dc509010e90a19fef87390c414d12827 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Sun, 15 Oct 2017 17:23:37 +0200
Subject: [PATCH] ad-auth: make samba admin password location variable

---
 ad-auth/defaults/main.yml | 1 +
 ad-auth/tasks/sssd.yml    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ad-auth/defaults/main.yml b/ad-auth/defaults/main.yml
index 088dcde..8ea448a 100644
--- a/ad-auth/defaults/main.yml
+++ b/ad-auth/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 
 ad_admin_group: admin
+ad_admin_password: samba-admin
diff --git a/ad-auth/tasks/sssd.yml b/ad-auth/tasks/sssd.yml
index d2983b9..ca1e74d 100644
--- a/ad-auth/tasks/sssd.yml
+++ b/ad-auth/tasks/sssd.yml
@@ -28,7 +28,7 @@
     - name: discover our realm
       command: realm discover -v "{{ domain }}"
     - name: get a kerberos ticket
-      shell: echo "{{ lookup('passwordstore', 'samba-admin') }}" | kinit Administrator
+      shell: echo "{{ lookup('passwordstore', ad_admin_password) }}" | kinit Administrator
       when: debian_version == "jessie"
       no_log: True
     - name: ensure pexpect is installed
@@ -38,7 +38,7 @@
       expect:
         command: kinit Administrator
         responses:
-          "Password for Administrator.*": "{{ lookup('passwordstore', 'samba-admin') }}"
+          "Passwor(d|t) for Administrator.*": "{{ lookup('passwordstore', ad_admin_password) }}"
       when: debian_version == "stretch"
       no_log: True
     - name: leave any other realm
-- 
GitLab