From 1d074bf14b870f0d1d7b0139b059b267d9992291 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Mon, 11 Dec 2023 03:26:12 +0100
Subject: [PATCH] Rename "local-net" to default and fix healthcheck network

---
 .../inventory/group_vars/all/compose_defaults.yml |  4 ++--
 _ansible/roles/forgejo-runner/vars/main.yml       |  2 +-
 .../roles/healthcheck/files/docker-compose.yml    |  6 +-----
 _ansible/roles/influxdb/vars/main.yml             |  2 +-
 _ansible/roles/tandoor/vars/main.yml              |  2 +-
 _ansible/roles/tinytinyrss/vars/main.yml          |  4 ++--
 _ansible/roles/webdis/vars/main.yml               |  2 +-
 _ansible/roles/woodpecker/vars/main.yml           |  2 +-
 healthcheck/.env                                  | 15 ---------------
 9 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 healthcheck/.env

diff --git a/_ansible/inventory/group_vars/all/compose_defaults.yml b/_ansible/inventory/group_vars/all/compose_defaults.yml
index 9738f93..fd3311a 100644
--- a/_ansible/inventory/group_vars/all/compose_defaults.yml
+++ b/_ansible/inventory/group_vars/all/compose_defaults.yml
@@ -6,12 +6,12 @@ compose_file_main:
       labels:
         com.centurylinklabs.watchtower.enable: "{{ compose.watchtower | default(false) }}"
       networks:
-        local-net:
+        default:
         apps:
           aliases:
             - "{{ svc.name }}"
   networks:
-    local-net:
+    default:
     apps:
       external: true
 
diff --git a/_ansible/roles/forgejo-runner/vars/main.yml b/_ansible/roles/forgejo-runner/vars/main.yml
index e670b22..920bccc 100644
--- a/_ansible/roles/forgejo-runner/vars/main.yml
+++ b/_ansible/roles/forgejo-runner/vars/main.yml
@@ -27,6 +27,6 @@ compose:
         privileged: true
         command: "dockerd -H tcp://0.0.0.0:2375 --tls=false"
         networks:
-          local-net:
+          default:
     volumes:
       data:
diff --git a/_ansible/roles/healthcheck/files/docker-compose.yml b/_ansible/roles/healthcheck/files/docker-compose.yml
index 145445c..8a5cbef 100644
--- a/_ansible/roles/healthcheck/files/docker-compose.yml
+++ b/_ansible/roles/healthcheck/files/docker-compose.yml
@@ -10,6 +10,7 @@ x-common-elements:
     - service.env
   volumes:
     - ./data/:/opt
+  network_mode: host
 
 services:
   http:
@@ -21,8 +22,3 @@ services:
   mail:
     <<: *common-elements
     command: "/opt/mail"
-
-networks:
-  default:
-    name: healthcheck
-    external: true
diff --git a/_ansible/roles/influxdb/vars/main.yml b/_ansible/roles/influxdb/vars/main.yml
index c51630e..4dc6aa8 100644
--- a/_ansible/roles/influxdb/vars/main.yml
+++ b/_ansible/roles/influxdb/vars/main.yml
@@ -63,7 +63,7 @@ svc_yml:
 
 compose:
   watchtower: false
-  image: influxdb:2
+  image: influxdb:2.7
   volumes:
     - ./influxdb.yml:/etc/influxdb2/config.yml
     - data:{{ svc.data_dir }}
diff --git a/_ansible/roles/tandoor/vars/main.yml b/_ansible/roles/tandoor/vars/main.yml
index c42560d..2359e14 100644
--- a/_ansible/roles/tandoor/vars/main.yml
+++ b/_ansible/roles/tandoor/vars/main.yml
@@ -56,7 +56,7 @@ compose:
           - nginx_config:/opt/recipes/nginx/conf.d
           - mediafiles:/opt/recipes/mediafiles
         networks:
-          local-net:
+          default:
     volumes:
       nginx_config:
       staticfiles:
diff --git a/_ansible/roles/tinytinyrss/vars/main.yml b/_ansible/roles/tinytinyrss/vars/main.yml
index 0cb65aa..05b053e 100644
--- a/_ansible/roles/tinytinyrss/vars/main.yml
+++ b/_ansible/roles/tinytinyrss/vars/main.yml
@@ -37,7 +37,7 @@ compose:
         volumes:
           - app:/var/www/html
         networks:
-          local-net:
+          default:
 
       updater:
         image: cthulhoo/ttrss-fpm-pgsql-static
@@ -50,7 +50,7 @@ compose:
           - tt-rss
         command: /opt/tt-rss/updater.sh
         networks:
-          local-net:
+          default:
     volumes:
       app:
 
diff --git a/_ansible/roles/webdis/vars/main.yml b/_ansible/roles/webdis/vars/main.yml
index 2bd330a..4250ba4 100644
--- a/_ansible/roles/webdis/vars/main.yml
+++ b/_ansible/roles/webdis/vars/main.yml
@@ -20,4 +20,4 @@ compose:
         labels:
           com.centurylinklabs.watchtower.enable: true
     networks:
-      local-net:
+      default:
diff --git a/_ansible/roles/woodpecker/vars/main.yml b/_ansible/roles/woodpecker/vars/main.yml
index 7e27513..dc214e1 100644
--- a/_ansible/roles/woodpecker/vars/main.yml
+++ b/_ansible/roles/woodpecker/vars/main.yml
@@ -50,4 +50,4 @@ compose:
         volumes:
           - /var/run/docker.sock:/var/run/docker.sock
         networks:
-          local-net:
+          default:
diff --git a/healthcheck/.env b/healthcheck/.env
deleted file mode 100644
index 70dab7b..0000000
--- a/healthcheck/.env
+++ /dev/null
@@ -1,15 +0,0 @@
-USER_AGENT="healthcheck-bot for serguzim.net"
-
-HTTP_HC_UID=
-
-MATRIX_SERVER="https://matrix.msrg.cc"
-MATRIX_SERVER_FEDTESTER="msrg.cc"
-MATRIX_HC_UID=
-MATRIX_TOKEN=
-MATRIX_ROOM=
-
-MAIL_HC_UID=
-MAIL_HOST=mail.serguzim.me
-MAIL_PORT=587
-MAIL_USER=healthcheck@serguzim.me
-MAIL_PASS=