From 477d074d4ce12b5fa96b0cf1276cc3ca20ca8757 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Fri, 3 Mar 2023 17:57:48 +0100
Subject: [PATCH] Add tags to all containers

---
 modules/docker-mailserver/default.nix |  1 +
 modules/gitea/default.nix             |  1 +
 modules/grav/default.nix              |  1 +
 modules/nextcloud/default.nix         |  3 +++
 modules/plex/default.nix              |  1 +
 modules/rss-bridge/default.nix        |  3 +++
 modules/ttrss-postgres/default.nix    | 15 ++++++++++++---
 7 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/docker-mailserver/default.nix b/modules/docker-mailserver/default.nix
index 26a0f3e..2beb661 100644
--- a/modules/docker-mailserver/default.nix
+++ b/modules/docker-mailserver/default.nix
@@ -43,6 +43,7 @@ in
         "--add-host=host.docker.internal:host-gateway"
         "--cap-add=NET_ADMIN"
         "--cap-add=SYS_PTRACE"
+        "--log-opt=tag='mailserver'"
       ];
     };
   };
diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix
index 234789f..8d775f6 100644
--- a/modules/gitea/default.nix
+++ b/modules/gitea/default.nix
@@ -30,6 +30,7 @@
       extraOptions = [
         ''--mount=type=volume,source=gitea_data,target=/data,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/gitea/data,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''
         "--add-host=host.docker.internal:host-gateway"
+        "--log-opt=tag='gitea'"
       ];
     };
   };
diff --git a/modules/grav/default.nix b/modules/grav/default.nix
index 614a100..bfcc236 100644
--- a/modules/grav/default.nix
+++ b/modules/grav/default.nix
@@ -19,6 +19,7 @@
       ];
       extraOptions = [
         ''--mount=type=volume,source=grav,target=/config,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/grav,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''
+        "--log-opt=tag='grav'"
       ];
     };
   };
diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix
index d969278..e02a0fc 100644
--- a/modules/nextcloud/default.nix
+++ b/modules/nextcloud/default.nix
@@ -46,6 +46,7 @@ in
         ''--mount=type=volume,source=nextcloud_data,target=/var/www/html,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/nextcloud/data,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''
         "--add-host=host.docker.internal:host-gateway"
         "--net=${networkName}"
+        "--log-opt=tag='nextcloud'"
       ];
     };
     containers."cron" = {
@@ -62,6 +63,7 @@ in
         ''--mount=type=volume,source=nextcloud_data,target=/var/www/html,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/server_data/nextcloud/data,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''
         "--add-host=host.docker.internal:host-gateway"
         "--net=nextcloud"
+        "--log-opt=tag='nextcloud-cron'"
       ];
     };
     containers."redis" = {
@@ -72,6 +74,7 @@ in
       ];
       extraOptions = [
         "--net=${networkName}"
+        "--log-opt=tag='redis'"
       ];
     };
   };
diff --git a/modules/plex/default.nix b/modules/plex/default.nix
index 43e409b..b59623b 100644
--- a/modules/plex/default.nix
+++ b/modules/plex/default.nix
@@ -35,6 +35,7 @@
       extraOptions = [
         ''--mount=type=volume,source=media,target=/mnt/media,volume-driver=local,volume-opt=type=nfs,volume-opt=device=:/media,"volume-opt=o=addr=10.7.89.108,rw,nfsvers=4.0,nolock,hard,noatime"''
         "--network=host"
+        "--log-opt=tag='plex'"
       ];
     };
   };
diff --git a/modules/rss-bridge/default.nix b/modules/rss-bridge/default.nix
index fb56e75..3b0a2e9 100644
--- a/modules/rss-bridge/default.nix
+++ b/modules/rss-bridge/default.nix
@@ -16,6 +16,9 @@ in
         "${whitelist}:/app/whitelist.txt"
         "/etc/localtime:/etc/localtime:ro"
       ];
+      extraOptions = [
+        "--log-opt=tag='rss-brige'"
+      ];
     };
   };
 }
diff --git a/modules/ttrss-postgres/default.nix b/modules/ttrss-postgres/default.nix
index 8bc8ecb..f064134 100644
--- a/modules/ttrss-postgres/default.nix
+++ b/modules/ttrss-postgres/default.nix
@@ -50,7 +50,10 @@ in
         "/var/lib/ttrss/html:/var/www/html"
         "/etc/localtime:/etc/localtime:ro"
       ];
-      extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
+      extraOptions = [
+        "--add-host=host.docker.internal:host-gateway"
+        "--log-opt=tag='ttrss'"
+      ];
     };
     containers."backup" = {
       image = ttrssImage;
@@ -63,7 +66,10 @@ in
         "/etc/localtime:/etc/localtime:ro"
       ];
       cmd = [ "/opt/tt-rss/dcron.sh" "-f" ];
-      extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
+      extraOptions = [
+        "--add-host=host.docker.internal:host-gateway"
+        "--log-opt=tag='ttrss-backup'"
+      ];
     };
     containers."updater" = {
       image = ttrssImage;
@@ -76,7 +82,10 @@ in
       ];
       cmd = [ "/opt/tt-rss/updater.sh" ];
       dependsOn = [ "ttrss" ];
-      extraOptions = [ "--add-host=host.docker.internal:host-gateway" ];
+      extraOptions = [
+        "--add-host=host.docker.internal:host-gateway"
+        "--log-opt=tag='ttrss-updater'"
+      ];
     };
   };