From cfd4699b4a13045d245174104c5bc61be97e52e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Fri, 22 Sep 2023 16:26:10 +0200
Subject: [PATCH 1/2] Initial diun stuff.

---
 roles/docker/defaults/main.yml       |  5 ++++
 roles/docker/tasks/services/diun.yml | 42 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 roles/docker/tasks/services/diun.yml

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 07c422c..8877571 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -216,3 +216,8 @@ services:
   watchtower:
     file: watchtower.yml
     version: "1.5.3"
+
+  diun:
+    file: diun.yml
+    version: "4.25"
+    volume_folder: "{{ volume_root_folder }}/diun"
diff --git a/roles/docker/tasks/services/diun.yml b/roles/docker/tasks/services/diun.yml
new file mode 100644
index 0000000..c1435a1
--- /dev/null
+++ b/roles/docker/tasks/services/diun.yml
@@ -0,0 +1,42 @@
+# vim: ft=yaml.ansible
+---
+
+- name: Create diun volume folder
+  file:
+    path: "{{ services.diun.volume_folder }}"
+    state: directory
+
+- name: Add diun notif config
+  template:
+    src: diun-notif-config.yml.j2
+    dest: "{{ services.diun.volume_folder }}/notif-config.yml"
+    owner: root
+    group: root
+    mode: 0600
+
+- name: Setup diun
+  docker_compose:
+    project_name: diun
+    pull: yes
+    definition:
+      version: "3.5"
+
+      services:
+        diun:
+          container_name: diun
+          image: "crazymax/diun:{{ services.diun.version }}"
+          command: serve
+          volumes:
+            - "./data:/data"
+            - "/var/run/docker.sock:/var/run/docker.sock"
+          environment:
+            - "TZ=Europe/Paris"
+            - "LOG_LEVEL=info"
+            - "LOG_JSON=false"
+            - "DIUN_WATCH_WORKERS=20"
+            - "DIUN_WATCH_SCHEDULE=0 */6 * * *"
+            - "DIUN_WATCH_JITTER=30s"
+            - "DIUN_PROVIDERS_DOCKER=true"
+          labels:
+            - "diun.enable=true"
+          restart: always
-- 
2.40.1


From 483bfaf792029160fb408924f0035532cd5937d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Thu, 28 Mar 2024 15:01:12 +0100
Subject: [PATCH 2/2] Got diun running.

---
 roles/docker/defaults/main.yml                |  3 +-
 roles/docker/templates/compose-files/diun.yml | 42 -------------------
 .../templates/compose-files/diun.yml.j2       | 21 ++++++++++
 3 files changed, 22 insertions(+), 44 deletions(-)
 delete mode 100644 roles/docker/templates/compose-files/diun.yml
 create mode 100644 roles/docker/templates/compose-files/diun.yml.j2

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index a2a6de9..f838c09 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -212,8 +212,7 @@ services:
     version: "1.5.3"
 
   diun:
-    file: diun.yml
-    version: "4.25"
+    version: "4.27"
     volume_folder: "{{ volume_root_folder }}/diun"
 
   ### Uptime monitoring ###
diff --git a/roles/docker/templates/compose-files/diun.yml b/roles/docker/templates/compose-files/diun.yml
deleted file mode 100644
index c1435a1..0000000
--- a/roles/docker/templates/compose-files/diun.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# vim: ft=yaml.ansible
----
-
-- name: Create diun volume folder
-  file:
-    path: "{{ services.diun.volume_folder }}"
-    state: directory
-
-- name: Add diun notif config
-  template:
-    src: diun-notif-config.yml.j2
-    dest: "{{ services.diun.volume_folder }}/notif-config.yml"
-    owner: root
-    group: root
-    mode: 0600
-
-- name: Setup diun
-  docker_compose:
-    project_name: diun
-    pull: yes
-    definition:
-      version: "3.5"
-
-      services:
-        diun:
-          container_name: diun
-          image: "crazymax/diun:{{ services.diun.version }}"
-          command: serve
-          volumes:
-            - "./data:/data"
-            - "/var/run/docker.sock:/var/run/docker.sock"
-          environment:
-            - "TZ=Europe/Paris"
-            - "LOG_LEVEL=info"
-            - "LOG_JSON=false"
-            - "DIUN_WATCH_WORKERS=20"
-            - "DIUN_WATCH_SCHEDULE=0 */6 * * *"
-            - "DIUN_WATCH_JITTER=30s"
-            - "DIUN_PROVIDERS_DOCKER=true"
-          labels:
-            - "diun.enable=true"
-          restart: always
diff --git a/roles/docker/templates/compose-files/diun.yml.j2 b/roles/docker/templates/compose-files/diun.yml.j2
new file mode 100644
index 0000000..b4285b8
--- /dev/null
+++ b/roles/docker/templates/compose-files/diun.yml.j2
@@ -0,0 +1,21 @@
+# vim: ft=yaml.ansible
+---
+version: "3.5"
+
+services:
+  diun:
+    image: "ghcr.io/crazy-max/diun:{{ services.diun.version }}"
+    command: serve
+    volumes:
+      - "./data:/data"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+    environment:
+      - "TZ=Europe/Paris"
+      - "DIUN_WATCH_WORKERS=20"
+      - "DIUN_WATCH_SCHEDULE=0 */6 * * *"
+      - "DIUN_WATCH_JITTER=30s"
+      - "DIUN_PROVIDERS_DOCKER=true"
+      - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true"
+    labels:
+      - "diun.enable=true"
+    restart: always
\ No newline at end of file
-- 
2.40.1