From 196638a46b8f42c3d35b57f54f88623addf4b05b Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 29 Sep 2024 12:36:58 +0100 Subject: [PATCH] Fix xandikos config and enable for Legion --- system/Legion.nix | 1 + system/services/xandikos.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/system/Legion.nix b/system/Legion.nix index 712d614a..61792a7b 100644 --- a/system/Legion.nix +++ b/system/Legion.nix @@ -10,6 +10,7 @@ ./services/satisfactory/default.nix ./services/sshd.nix ./services/syncthing.nix + ./services/xandikos.nix ]; boot.loader = { systemd-boot.enable = true; diff --git a/system/services/xandikos.nix b/system/services/xandikos.nix index 1a55bc67..5a8cab37 100644 --- a/system/services/xandikos.nix +++ b/system/services/xandikos.nix @@ -1,20 +1,20 @@ { ... }: let - port = "5232"; + port = 5232; in { services.xandikos = { inherit port; enable = true; - routePrefix = "/cal"; + routePrefix = "/dav"; extraOptions = [ "--defaults" ]; }; - services.caddy.virtualHosts."cal.xenia.me.uk".extraConfig = '' + services.caddy.virtualHosts."dav.xenia.me.uk".extraConfig = '' basicauth { pixelifytica $2a$14$AwYqa81IWL8lU7B5SrQhlOILZj4VqCgcIn9cte8nytQIP/WhfJoSG } - respond /.well-known/caldav http://localhost:${port}/user/calendars - respond /.well-known/carddav http://localhost:${port}/user/contacts - reverse_proxy http://localhost:${port} + respond /.well-known/caldav http://localhost:${toString port}/user/calendars + respond /.well-known/carddav http://localhost:${toString port}/user/contacts + reverse_proxy http://localhost:${toString port} ''; }