From 3f4f5743e4ae3bb10a18dd9db104495775bdef60 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 22 Feb 2024 19:10:47 -0700 Subject: [PATCH] webfortune: add goatcounter Signed-off-by: Sumner Evans --- flake.lock | 12 ++++++------ host-configurations/morak.nix | 1 + modules/services/default.nix | 1 - modules/services/webfortune.nix | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index ff87b14..f96daf3 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "templ": "templ" }, "locked": { - "lastModified": 1707764805, - "narHash": "sha256-08wuCnGMzkGgasya+vYQLSx2aObFn1BzOgmt8BoWOm4=", + "lastModified": 1708654099, + "narHash": "sha256-RmJCGRbEoUt+S6dHHz7T8t3wDkTeUzqstaVhmz/HI7k=", "owner": "sumnerevans", "repo": "webfortune", - "rev": "e8a54165be20e13b0eeedcaab134e062e755e290", + "rev": "eaf2b47a96608203774d66afee276df490f478b5", "type": "github" }, "original": { diff --git a/host-configurations/morak.nix b/host-configurations/morak.nix index 78c6237..5240137 100644 --- a/host-configurations/morak.nix +++ b/host-configurations/morak.nix @@ -69,6 +69,7 @@ in { services.isso.enable = true; services.logrotate.enable = true; services.nginx.enable = true; + services.postgresql.enable = true; services.syncthing.enable = true; services.vaultwarden.enable = true; services.xandikos.enable = true; diff --git a/modules/services/default.nix b/modules/services/default.nix index aed41b4..6c80a21 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -22,5 +22,4 @@ # Enable Redis and PostgreSQL services.redis.servers."".enable = true; - services.postgresql.enable = true; } diff --git a/modules/services/webfortune.nix b/modules/services/webfortune.nix index 78d9498..8ed24b2 100644 --- a/modules/services/webfortune.nix +++ b/modules/services/webfortune.nix @@ -47,6 +47,7 @@ in { QUOTESFILE_SOURCE_URL = cfg.sourceUrl; LISTEN_ADDR = cfg.listenAddr; PLAUSIBLE_DOMAIN = cfg.virtualHost; + GOATCOUNTER_DOMAIN = "https://fortune.goatcounter.com/count"; HOST_ROOT = "https://${cfg.virtualHost}"; }; serviceConfig = {