From 06f46451278c3fbc3fb87a0673f681ecf113a310 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sun, 19 Sep 2021 19:16:24 +0000
Subject: [PATCH] rclone: Move more generic stuff away from web-logs role

---
 roles/rclone/tasks/main.yml                     | 16 ++++++++++++++++
 .../templates/rclone-sync.sh.j2}                |  7 +------
 roles/web-logs/tasks/main.yml                   | 17 +----------------
 3 files changed, 18 insertions(+), 22 deletions(-)
 rename roles/{web-logs/files/sync-http-logs.sh => rclone/templates/rclone-sync.sh.j2} (83%)

diff --git a/roles/rclone/tasks/main.yml b/roles/rclone/tasks/main.yml
index cc83f04..6c636c3 100644
--- a/roles/rclone/tasks/main.yml
+++ b/roles/rclone/tasks/main.yml
@@ -19,3 +19,19 @@
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
+
+- name: create log directory
+  file:
+    path: /var/log/rclone
+    state: directory
+    mode: 0750
+    owner: "{{ local_user | default('root') }}"
+    group: "{{ local_user | default(ansible_wheel) }}"
+
+- name: copy logsync script
+  template:
+    dest: /usr/local/bin/rclone-sync
+    src: rclone-sync.sh.j2
+    mode: 0755
+    owner: root
+    group: "{{ ansible_wheel }}"
diff --git a/roles/web-logs/files/sync-http-logs.sh b/roles/rclone/templates/rclone-sync.sh.j2
similarity index 83%
rename from roles/web-logs/files/sync-http-logs.sh
rename to roles/rclone/templates/rclone-sync.sh.j2
index 0c77cb3..a7aadb6 100755
--- a/roles/web-logs/files/sync-http-logs.sh
+++ b/roles/rclone/templates/rclone-sync.sh.j2
@@ -3,18 +3,13 @@
 set -u
 umask 027
 
-TARGET="/var/cache/sync-http-logs"
+TARGET="{{ destination }}"
 CONFIG="/etc/rclone/rclone.conf"
 LOGDIR="/var/log/rclone"
 RCLONE="/usr/local/bin/rclone"
 
 timestamp="$(date +%Y%m%d%H%M%S)"
 
-if [ "$(whoami)" != "logsync" ]; then
-    echo "ERR: Script needs to be run as logsync user" 1>&2
-    exit 1
-fi
-
 if [ ! -d "$TARGET" ]; then
     echo "ERR: Destination directory '${TARGET}' does not exist" 1>&2
     exit 1
diff --git a/roles/web-logs/tasks/main.yml b/roles/web-logs/tasks/main.yml
index db3ef06..c738914 100644
--- a/roles/web-logs/tasks/main.yml
+++ b/roles/web-logs/tasks/main.yml
@@ -19,6 +19,7 @@
   vars:
     remote_user: logsync
     hostgroup: webservers
+    destination: /var/cache/sync-http-logs
 
 - name: create data directories
   file:
@@ -30,22 +31,6 @@
   with_items:
     - /var/cache/sync-http-logs
 
-- name: create log directory
-  file:
-    path: /var/log/rclone
-    state: directory
-    mode: 0750
-    owner: logsync
-    group: "{{ ansible_wheel }}"
-
-- name: copy logsync script
-  copy:
-    dest: /usr/local/bin/sync-http-logs
-    src: sync-http-logs.sh
-    mode: 0755
-    owner: root
-    group: "{{ ansible_wheel }}"
-
 - name: add log sync cron job
   cron:
     name: sync-http-logs