From 5585fb0b126199afe8ea43177b26be6299989d94 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 23 Apr 2020 21:51:01 +0100
Subject: [PATCH] Convert watchtower into its own role

---
 ansible/main.yml                                          | 3 ++-
 ansible/roles/docker/tasks/main.yml                       | 3 ---
 .../watchtower => watchtower/files}/docker-compose.yml    | 0
 .../tasks/watchtower.yml => watchtower/tasks/main.yml}    | 8 ++++----
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename ansible/roles/{docker/files/watchtower => watchtower/files}/docker-compose.yml (100%)
 rename ansible/roles/{docker/tasks/watchtower.yml => watchtower/tasks/main.yml} (79%)

diff --git a/ansible/main.yml b/ansible/main.yml
index edecf30..af6e519 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -21,6 +21,7 @@
         docker_users:
           - "{{ user }}"
     - docker-cleanup
-    - traefik
     - netdata
+    - traefik
+    - watchtower
     - docker
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 97d8f9f..54ade26 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -49,9 +49,6 @@
 - name: Install wallabag
   include: wallabag.yml
 
-- name: Install watchtower
-  include: watchtower.yml
-
 - name: Install whoami
   include: whoami.yml
 
diff --git a/ansible/roles/docker/files/watchtower/docker-compose.yml b/ansible/roles/watchtower/files/docker-compose.yml
similarity index 100%
rename from ansible/roles/docker/files/watchtower/docker-compose.yml
rename to ansible/roles/watchtower/files/docker-compose.yml
diff --git a/ansible/roles/docker/tasks/watchtower.yml b/ansible/roles/watchtower/tasks/main.yml
similarity index 79%
rename from ansible/roles/docker/tasks/watchtower.yml
rename to ansible/roles/watchtower/tasks/main.yml
index 6e33152..345d9fa 100644
--- a/ansible/roles/docker/tasks/watchtower.yml
+++ b/ansible/roles/watchtower/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Create watchtower directory
+- name: Create directory
   file:
     path: /opt/watchtower
     state: directory
@@ -6,9 +6,9 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Install watchtower compose file
+- name: Install compose file
   template:
-    src: files/watchtower/docker-compose.yml
+    src: files/docker-compose.yml
     dest: /opt/watchtower/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
@@ -16,7 +16,7 @@
   register: compose_file
   become: true
 
-- name: Cycle watchtower container
+- name: Cycle container
   docker_compose:
     project_src: /opt/watchtower
     pull: true