nixos/xandikos: support UNIX sockets, use systemd socket activation

This way systemd takes care of the owner and the permissions of the socket.
NixOS · Dec 13, 2022 · a624b26 · a624b26
1 parent 2a04b5f
commit a624b26
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix
@@ -4,6 +4,24 @@ with lib;
 
 let
   cfg = config.services.xandikos;
+
+  listenStream =
+    if cfg.address == null then
+      [ "[::1]:${toString cfg.port}" "127.0.0.1:${toString cfg.port}" ]
+    else if hasInfix "/" cfg.address then
+      [ cfg.address ]
+    else if hasInfix ":" cfg.address then
+      [ "[${cfg.address}]:${toString cfg.port}" ]
+    else
+      [ "${cfg.address}:${toString cfg.port}" ]
+    ;
+
+  nginxProxyAddress =
+    if hasInfix "/" (head listenStream) then
+      "unix:${head listenStream}"
+    else
+      head listenStream
+    ;
 in
 {
 
@@ -19,12 +37,13 @@ in
       };
 
       address = mkOption {
-        type = types.str;
-        default = "localhost";
+        type = types.nullOr types.str;
+        default = null;
         description = lib.mdDoc ''
-          The IP address on which Xandikos will listen.
+          The IP address or socket path on which Xandikos will listen.
           By default listens on localhost.
         '';
+        example = "/run/xandikos/socket";
       };
 
       port = mkOption {
@@ -92,11 +111,13 @@ in
       {
         meta.maintainers = with lib.maintainers; [ _0x4A6F ];
 
+        systemd.sockets.xandikos = {
+          wantedBy = [ "sockets.target" ];
+          socketConfig.ListenStream = listenStream;
+        };
+
         systemd.services.xandikos = {
           description = "A Simple Calendar and Contact Server";
-          after = [ "network.target" ];
-          wantedBy = [ "multi-user.target" ];
-
           serviceConfig = {
             User = "xandikos";
             Group = "xandikos";
@@ -122,8 +143,6 @@ in
             ExecStart = ''
               ${cfg.package}/bin/xandikos \
                 --directory /var/lib/xandikos \
-                --listen-address ${cfg.address} \
-                --port ${toString cfg.port} \
                 --route-prefix ${cfg.routePrefix} \
                 ${lib.concatStringsSep " " cfg.extraOptions}
             '';
@@ -137,7 +156,7 @@ in
             enable = true;
             virtualHosts."${cfg.nginx.hostName}" = {
               locations."/" = {
-                proxyPass = "http://${cfg.address}:${toString cfg.port}/";
+                proxyPass = "http://${nginxProxyAddress}";
               };
             };
           };

diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix
@@ -15,8 +15,6 @@ import ./make-test-python.nix (
         xandikos_proxy = {
           networking.firewall.allowedTCPPorts = [ 80 8080 ];
           services.xandikos.enable = true;
-          services.xandikos.address = "localhost";
-          services.xandikos.port = 8080;
           services.xandikos.routePrefix = "/xandikos-prefix/";
           services.xandikos.extraOptions = [
             "--defaults"
@@ -39,9 +37,7 @@ import ./make-test-python.nix (
         start_all()
 
         with subtest("Xandikos default"):
-            xandikos_default.wait_for_unit("multi-user.target")
-            xandikos_default.wait_for_unit("xandikos.service")
-            xandikos_default.wait_for_open_port(8080)
+            xandikos_default.wait_for_unit("sockets.target")
             xandikos_default.succeed("curl --fail http://localhost:8080/")
             xandikos_default.succeed(
                 "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos"
@@ -50,9 +46,7 @@ import ./make-test-python.nix (
             xandikos_client.fail("curl --fail http://xandikos_default:8080/")
 
         with subtest("Xandikos proxy"):
-            xandikos_proxy.wait_for_unit("multi-user.target")
-            xandikos_proxy.wait_for_unit("xandikos.service")
-            xandikos_proxy.wait_for_open_port(8080)
+            xandikos_proxy.wait_for_unit("sockets.target")
             xandikos_proxy.succeed("curl --fail http://localhost:8080/")
             xandikos_proxy.succeed(
                 "curl -s --fail --location http://localhost:8080/ | grep -i Xandikos"