From 13a9664c5b74b554af57773a48624c327c65e119 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 28 Jul 2024 11:40:39 +0200
Subject: linde: use NixOS goatcounter module

---
 packages         |  2 +-
 system/linde.nix | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages b/packages
index b8ac79d7..28d9936c 160000
--- a/packages
+++ b/packages
@@ -1 +1 @@
-Subproject commit b8ac79d7ead214f96cc8b642fa7ce085a2ee2043
+Subproject commit 28d9936cec38475f6766cf07dd0b8a9d279e7632
diff --git a/system/linde.nix b/system/linde.nix
index ee680eb0..730e0a14 100644
--- a/system/linde.nix
+++ b/system/linde.nix
@@ -24,7 +24,6 @@ in
   imports =
     [
       <personal/modules/nixos/laminar.nix>
-      <personal/modules/nixos/goatcounter.nix>
       <home-manager/nixos>
       <agenix/modules/age.nix>
       <searchix/nix/modules>
@@ -352,15 +351,17 @@ in
 
   services.goatcounter = {
     enable = true;
-    listenAddress = "localhost";
+    address = "localhost";
     port = 8082;
-    package = (import <personal> { inherit pkgs; }).goatcounter;
-    settings = {
-      tls = "proxy";
-      websocket = true;
-      automigrate = true;
-      smtp = "smtp://localhost:25";
-    };
+    proxy = true;
+    extraArgs = [
+      "-db"
+      "sqlite3+db/goatcounter.sqlite3"
+      "-websocket"
+      "-automigrate"
+      "-smtp"
+      "smtp://localhost:25"
+    ];
   };
 
   services.powerdns =
@@ -805,7 +806,7 @@ in
             useACMEHost = "stats.alanpearce.eu";
             serverAliases = [ "*.stats.alanpearce.eu" ];
             extraConfig = ''
-              reverse_proxy ${srv.listenAddress}:${toString srv.port}
+              reverse_proxy ${srv.address}:${toString srv.port}
             '';
           };
         "go.alanpearce.eu" = {
-- 
cgit 1.4.1