From b06fd3cceb6fc50d9bef530813bb636c9cf12817 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 20 Nov 2021 21:48:27 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 18 +++++++++--------- modules/base/sshd/default.nix | 2 +- modules/services/data-access/default.nix | 2 +- modules/work/mounts/default.nix | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index f95e9a40..468959d7 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1634404028, - "narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=", + "lastModified": 1637439787, + "narHash": "sha256-+ov6MEVmyVdJBjRZxqPdhURLUkIgallbS5eqDVHh+gs=", "owner": "ryantm", "repo": "agenix", - "rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27", + "rev": "4fefd7cfffd548c04510c69c3f3e8e2be032412f", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1637399921, - "narHash": "sha256-gABxNlp7Xz4xF+0jilExk5IedYeOe3rx/WOj2ZpdTg0=", + "lastModified": 1637426421, + "narHash": "sha256-LlRwbps05ck31yf00rZqlW4SPXCVGpfXcoUXm+VmuLQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6da7e363211fb0247785651489e5825ee8f29c6", + "rev": "ac2998922b6b4b15a517f5bbbfc2a6098d2aa334", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1637398025, - "narHash": "sha256-hDnoEJuEimTU2FlsDH7P0PoOjyCVN+7ZpP++4BjC6kY=", + "lastModified": 1637398047, + "narHash": "sha256-H6yh2VvABMhrkjYrPccc0Buak4L9jtFzsb98FsNDM2Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "a19f40d39dfedb9158c29566169f49c6b80a8865", + "rev": "c82bc787b8990c89f2f7d57df652ce2424129b92", "type": "github" }, "original": { diff --git a/modules/base/sshd/default.nix b/modules/base/sshd/default.nix index 040e0d77..7d683d3d 100644 --- a/modules/base/sshd/default.nix +++ b/modules/base/sshd/default.nix @@ -10,7 +10,7 @@ { bits = 4096; path = "${config.chvp.dataPrefix}/etc/ssh/ssh_host_rsa_key"; type = "rsa"; } { path = "${config.chvp.dataPrefix}/etc/ssh/ssh_host_ed25519_key"; type = "ed25519"; } ]; - authorizedKeysFiles = [ "/run/secrets/authorized_keys/%u" ]; + authorizedKeysFiles = [ "/run/agenix/authorized_keys/%u" ]; }; age.secrets."authorized_keys/root".file = ../../../secrets/authorized_keys/root.age; diff --git a/modules/services/data-access/default.nix b/modules/services/data-access/default.nix index 5ee0530f..a7583225 100644 --- a/modules/services/data-access/default.nix +++ b/modules/services/data-access/default.nix @@ -41,7 +41,7 @@ isReadOnly = false; }; "/run/secrets" = { - hostPath = "/run/secrets/data-access"; + hostPath = "/run/agenix/data-access"; isReadOnly = true; }; }; diff --git a/modules/work/mounts/default.nix b/modules/work/mounts/default.nix index a6bbcbc2..8f6cd1fe 100644 --- a/modules/work/mounts/default.nix +++ b/modules/work/mounts/default.nix @@ -15,13 +15,13 @@ "/mnt/ugent/files" = { device = "//files.ugent.be/ecvpeteg"; fsType = "cifs"; - options = [ "credentials=/run/secrets/passwords/ugent-mount-credentials,${automount_opts},users,vers=3.0,noperm,domain=UGENT,sec=ntlmv2i" ]; + options = [ "credentials=${config.age.secrets."passwords/ugent-mount-credentials".path},${automount_opts},users,vers=3.0,noperm,domain=UGENT,sec=ntlmv2i" ]; noCheck = true; }; "/mnt/ugent/webhost" = { device = "//webhost.ugent.be/ecvpeteg"; fsType = "cifs"; - options = [ "credentials=/run/secrets/passwords/ugent-mount-credentials,${automount_opts},users,vers=3.0" ]; + options = [ "credentials=${config.age.secrets."passwords/ugent-mount-credentials".path},${automount_opts},users,vers=3.0" ]; noCheck = true; }; };