From 8ebb299d40e49c82226200243d2772ffa9994ddc Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Tue, 1 Aug 2017 12:35:58 +0100
Subject: [PATCH] ci-workers: Enable pipelining, and use root to set admin and
 host details

Workarounds for Ansible issues when becoming an unprivileged user:
https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user
---
 contrib/ci-workers/ansible.cfg |  2 ++
 contrib/ci-workers/unix.yml    | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 contrib/ci-workers/ansible.cfg

diff --git a/contrib/ci-workers/ansible.cfg b/contrib/ci-workers/ansible.cfg
new file mode 100644
index 000000000..c58fea3c0
--- /dev/null
+++ b/contrib/ci-workers/ansible.cfg
@@ -0,0 +1,2 @@
+[ssh_connection]
+pipelining = True
diff --git a/contrib/ci-workers/unix.yml b/contrib/ci-workers/unix.yml
index 42bcaafc2..ad78f7914 100644
--- a/contrib/ci-workers/unix.yml
+++ b/contrib/ci-workers/unix.yml
@@ -99,14 +99,18 @@
     - name: Set admin details for Buildbot worker
       copy:
         content: "{{ buildbot_worker_admin }}"
-        dest: "~/{{ buildbot_worker_name }}/info/admin"
-      become_user: "{{ buildbot_worker_user }}"
+        dest: "~{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/info/admin"
+        owner: "{{ buildbot_worker_user }}"
+        group: "{{ buildbot_worker_user }}"
+        mode: "0644"
 
     - name: Set host details for Buildbot worker
       template:
         src: "{{ buildbot_worker_host_template }}"
-        dest: "~/{{ buildbot_worker_name }}/info/host"
-      become_user: "{{ buildbot_worker_user }}"
+        dest: "~{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/info/host"
+        owner: "{{ buildbot_worker_user }}"
+        group: "{{ buildbot_worker_user }}"
+        mode: "0644"
 
     - name: Copy Buildbot worker systemd service unit
       template: