From e366a05204a70851a74d0e1e666d9cfe12cd6db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Tue, 28 Jan 2025 00:49:22 +0100
Subject: [PATCH] Fix caddy logging

---
 services/http-proxy/proxy.nix | 41 ++++++++++++++++++++++++++---------
 services/nix-cache/proxy.nix  |  5 ++++-
 system/monitoring/logs.nix    | 15 ++++++++++++-
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/services/http-proxy/proxy.nix b/services/http-proxy/proxy.nix
index d36e983..f3614c4 100644
--- a/services/http-proxy/proxy.nix
+++ b/services/http-proxy/proxy.nix
@@ -2,6 +2,7 @@
 {
   services.caddy = {
     enable = true;
+    package = pkgs.unstable.caddy;
     configFile = pkgs.writeText "Caddyfile" ''
       {
         acme_ca https://ca.home.2rjus.net/acme/acme/directory
@@ -9,63 +10,83 @@
 
       nzbget.home.2rjus.net {
         log {
-          output file /var/log/caddy/nzbget.log
+          output file /var/log/caddy/nzbget.log {
+            mode 644
+          }
         }
         reverse_proxy http://nzbget-jail.home.2rjus.net:6789
       }
 
       radarr.home.2rjus.net {
         log {
-          output file /var/log/caddy/radarr.log
+          output file /var/log/caddy/radarr.log {
+            mode 644
+          }
         }
         reverse_proxy http://radarr-jail.home.2rjus.net:7878
       }
 
       sonarr.home.2rjus.net {
         log {
-          output file /var/log/caddy/sonarr.log
+          output file /var/log/caddy/sonarr.log {
+            mode 644
+          }
         }
         reverse_proxy http://sonarr-jail.home.2rjus.net:8989
       }
       ha.home.2rjus.net {
         log {
-          output file /var/log/caddy/ha.log
+          output file /var/log/caddy/ha.log {
+            mode 644
+          }
         }
         reverse_proxy http://ha1.home.2rjus.net:8123
       }
       z2m.home.2rjus.net {
         log {
-          output file /var/log/caddy/z2m.log
+          output file /var/log/caddy/z2m.log {
+            mode 644
+          }
         }
         reverse_proxy http://ha1.home.2rjus.net:8080
       }
       prometheus.home.2rjus.net {
         log {
-          output file /var/log/caddy/prometheus.log
+          output file /var/log/caddy/prometheus.log {
+            mode 644
+          }
         }
         reverse_proxy http://monitoring01.home.2rjus.net:9090
       }
       alertmanager.home.2rjus.net {
         log {
-          output file /var/log/caddy/alertmanager.log
+          output file /var/log/caddy/alertmanager.log {
+            mode 644
+          }
         }
         reverse_proxy http://monitoring01.home.2rjus.net:9093
       }
       grafana.home.2rjus.net {
         log {
-          output file /var/log/caddy/grafana.log
+          output file /var/log/caddy/grafana.log {
+            mode 644
+          }
         }
         reverse_proxy http://monitoring01.home.2rjus.net:3000
       }
       jelly.home.2rjus.net {
         log {
-          output file /var/log/caddy/jelly.log
+          output file /var/log/caddy/jelly.log {
+            mode 644
+          }
         }
         reverse_proxy http://jelly01.home.2rjus.net:8096
       }
       http://http-proxy.home.2rjus.net/metrics {
         log {
-          output file /var/log/caddy/caddy-metrics.log
+          output file /var/log/caddy/caddy-metrics.log {
+            mode 644
+          }
         }
         metrics
       }
diff --git a/services/nix-cache/proxy.nix b/services/nix-cache/proxy.nix
index d530651..17e4f11 100644
--- a/services/nix-cache/proxy.nix
+++ b/services/nix-cache/proxy.nix
@@ -2,6 +2,7 @@
 {
   services.caddy = {
     enable = true;
+    package = pkgs.unstable.caddy;
     configFile = pkgs.writeText "Caddyfile" ''
       {
         acme_ca https://ca.home.2rjus.net/acme/acme/directory
@@ -9,7 +10,9 @@
 
       nix-cache.home.2rjus.net {
         log {
-          output file /var/log/caddy/nix-cache.log
+          output file /var/log/caddy/nix-cache.log {
+            mode 644
+          }
         }
         reverse_proxy http://localhost:5000
       }
diff --git a/system/monitoring/logs.nix b/system/monitoring/logs.nix
index 8b9e3bb..603ec53 100644
--- a/system/monitoring/logs.nix
+++ b/system/monitoring/logs.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 {
   services.promtail = {
     enable = true;
@@ -36,6 +36,19 @@
             }
           ];
         }
+        {
+          job_name = "varlog";
+          static_configs = [
+            {
+              targets = [ "localhost" ];
+              labels = {
+                job = "varlog";
+                __path__ = "/var/log/**/*.log";
+                hostname = "${config.networking.hostName}";
+              };
+            }
+          ];
+        }
       ];
     };
   };