From fd87cb00d0c31e46b75016103d35db7c1fe5fd11 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Mon, 26 Oct 2020 18:36:49 -0500
Subject: [PATCH] Template out ansible-pull.cfg BEFORE first run Turns out this
 caused serious problems if a host had never actually fully run ansible-pull
 before

---
 roles/ansible-pull/tasks/main.yml                             | 4 ++++
 .../ansible-pull/templates/ansible-pull.cfg                   | 0
 roles/ansible-pull/templates/ansible-pull.service             | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename ansible-pull.cfg => roles/ansible-pull/templates/ansible-pull.cfg (100%)

diff --git a/roles/ansible-pull/tasks/main.yml b/roles/ansible-pull/tasks/main.yml
index 371002d..bba741c 100644
--- a/roles/ansible-pull/tasks/main.yml
+++ b/roles/ansible-pull/tasks/main.yml
@@ -12,6 +12,10 @@
       become_user: ansible
     - name: Configure systemd unit
       block:
+        - name: Template out config
+          template: src=ansible-pull.cfg dest=~/ansible-pull.cfg
+          become: yes
+          become_user: ansible
         - name: Template out services
           template:
             src: "{{ item.src }}"
diff --git a/ansible-pull.cfg b/roles/ansible-pull/templates/ansible-pull.cfg
similarity index 100%
rename from ansible-pull.cfg
rename to roles/ansible-pull/templates/ansible-pull.cfg
diff --git a/roles/ansible-pull/templates/ansible-pull.service b/roles/ansible-pull/templates/ansible-pull.service
index 92e9928..ba7e734 100644
--- a/roles/ansible-pull/templates/ansible-pull.service
+++ b/roles/ansible-pull/templates/ansible-pull.service
@@ -7,7 +7,7 @@ StartLimitBurst=5
 [Service]
 User=ansible
 Group=ansible
-Environment=ANSIBLE_CONFIG=~/ansible-pull-repo/ansible-pull.cfg
+Environment=ANSIBLE_CONFIG=~/ansible-pull.cfg
 ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "{{ ansible_pull_repo }}" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" "{{ ansible_pull_playbook }}"
 Restart=on-failure
 RestartSec=90