From ffdcf54fefa2e2f761d3206ac8684adf6256e61a Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Thu, 14 May 2020 18:11:06 +0200
Subject: [PATCH] no user configuration here

---
 files/systemd/buildbot-worker@.service |  4 ++--
 tasks/buildbot-worker.yaml             | 31 +-------------------------
 tasks/setup.yaml                       |  5 -----
 vars/main.yaml                         |  3 ---
 4 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/files/systemd/buildbot-worker@.service b/files/systemd/buildbot-worker@.service
index d460d87..768b535 100644
--- a/files/systemd/buildbot-worker@.service
+++ b/files/systemd/buildbot-worker@.service
@@ -11,8 +11,8 @@ After=network.target
 [Service]
 User=%i
 Group=%i
-WorkingDirectory=/var/lib/buildbot-worker/%i
-ExecStart=/usr/local/bin/buildbot-worker start --nodaemon worker
+WorkingDirectory=~
+ExecStart=/usr/local/bin/buildbot-worker start --nodaemon buildbot-worker
 # if using EC2 Latent worker, you want to uncomment following line, and comment out the Restart line
 # ExecStopPost=shutdown now
 Restart=always
diff --git a/tasks/buildbot-worker.yaml b/tasks/buildbot-worker.yaml
index f15da39..0bc7db3 100644
--- a/tasks/buildbot-worker.yaml
+++ b/tasks/buildbot-worker.yaml
@@ -1,36 +1,7 @@
 ---
 
-- name: buildbot-worker group
-  group:
-    name: "{{ buildbot_worker_group }}"
-
-- name: buildbot-worker user
-  user:
-    name: "{{ buildbot_worker_user }}"
-    group: "{{ buildbot_worker_group }}"
-    home: "{{ buildbot_worker_home_directory }}"
-    shell: /usr/bin/fish
-    password_lock: true
-
-- name: buildbot-worker home directory
-  file:
-    path: "{{ buildbot_worker_home_directory }}"
-    owner: "{{ buildbot_worker_user }}"
-    group: "{{ buildbot_worker_group }}"
-    state: directory
-    mode: u=rwx,g=rx,o=
-
-# source of unit file from https://github.com/buildbot/buildbot-contrib/blob/master/worker/contrib/systemd/buildbot-worker%40.service
-- name: buildbot-worker systemd service unit
-  copy:
-    src: systemd/buildbot-worker@.service
-    dest: /etc/systemd/system/buildbot-worker@.service
-  notify:
-    - systemd daemon reload
-    - restart buildbot-worker service
-
 - name: initiate buildbot-worker
-  command: buildbot-worker create-worker worker localhost:9989 "{{buildbot_worker_name}}" "{{buildbot_worker_password}}"
+  command: buildbot-worker create-worker buildbot-worker localhost:9989 "{{buildbot_worker_name}}" "{{buildbot_worker_password}}"
   become: true
   become_user: "{{buildbot_worker_user}}"
   args:
diff --git a/tasks/setup.yaml b/tasks/setup.yaml
index 03839f7..3b15a9a 100644
--- a/tasks/setup.yaml
+++ b/tasks/setup.yaml
@@ -5,8 +5,3 @@
     name:
       - buildbot-worker
     executable: pip3
-
-- name: buildbot-worker var directory
-  file:
-    path: /var/lib/buildbot-worker
-    state: directory
diff --git a/vars/main.yaml b/vars/main.yaml
index 1cdc2b5..ed97d53 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -1,4 +1 @@
 ---
-buildbot_worker_user: "{{ buildbot_worker_name }}"
-buildbot_worker_group: "{{ buildbot_worker_name }}"
-buildbot_worker_home_directory: "/var/lib/buildbot-worker/{{ buildbot_worker_name }}"