From d0d1e2e5a713236198cb79ad7cb3f1ef4a0caf5f Mon Sep 17 00:00:00 2001 From: Soispha Date: Tue, 6 Jun 2023 15:43:42 +0200 Subject: Fix(system/services/serverphone): Assure that all paths are available --- flake.lock | 8 ++++---- secrets/default.nix | 8 ++++---- system/services/serverphone/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index d59039ad..484093d7 100644 --- a/flake.lock +++ b/flake.lock @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1686058286, - "narHash": "sha256-y77bITczIZ1ptl3UesQt2k56vT0f2uTwjoe/D4Ey4Do=", + "lastModified": 1686062745, + "narHash": "sha256-ET3mktSfUGZySbJwk29QXo5qyzjFM9gHDmKuVBEutyo=", "ref": "refs/heads/prime", - "rev": "8e629a33720d249f957c64b751e6b690933245d8", - "revCount": 16, + "rev": "fcf7fee057bb1d66b6c5e3a677941715cd5665f5", + "revCount": 19, "type": "git", "url": "https://codeberg.org/vhack.eu/serverphone.git" }, diff --git a/secrets/default.nix b/secrets/default.nix index 724b6979..9811e29c 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -12,14 +12,14 @@ in { serverphoneCa = { file = ./serverphone/ca.key; mode = "700"; - owner = "root"; - group = "root"; + owner = "serverphone"; + group = "serverphone"; }; serverphoneServer = { file = ./serverphone/server.key; mode = "700"; - owner = "root"; - group = "root"; + owner = "serverphone"; + group = "serverphone"; }; }; }; diff --git a/system/services/serverphone/default.nix b/system/services/serverphone/default.nix index 5b43f5ee..5b957b05 100644 --- a/system/services/serverphone/default.nix +++ b/system/services/serverphone/default.nix @@ -19,8 +19,8 @@ } ]; }; - caCertificate = "certificates/ca.crt"; - certificate = "certificates/server.crt"; + caCertificate = "${./certificates/ca.crt}"; + certificate = "${./certificates/server.crt}"; privateKey = config.age.secrets.serverphoneServer.path; certificateRequest = { acceptedUsers = [ -- cgit 1.4.1