diff options
| author | Jasper Ras <jras@hostnet.nl> | 2025-03-29 11:32:09 +0100 |
|---|---|---|
| committer | Jasper Ras <jras@hostnet.nl> | 2025-03-29 11:32:09 +0100 |
| commit | 5b41ca762c6a44fa7a77e5f5324bcecf8a47f4c7 (patch) | |
| tree | 1613d6bc1f613bf9248ceb858b8b4110836d532b | |
| parent | 2b8c1de8ca4d1a9ce90268189d5206ae27e6634b (diff) | |
| parent | 5e3187e05d876f4e6b6fe20cc4c387daeffabe9c (diff) | |
Merge branch 'main' of snorlax.home:nixos
| -rw-r--r-- | lib/mkserver.nix | 4 | ||||
| -rw-r--r-- | nodes/backup.jras.nl/default.nix (renamed from node/backup.jras.nl/default.nix) | 0 | ||||
| -rw-r--r-- | nodes/backup.jras.nl/disk-config.nix (renamed from node/backup.jras.nl/disk-config.nix) | 0 | ||||
| -rw-r--r-- | nodes/backup.jras.nl/facter.json (renamed from node/backup.jras.nl/facter.json) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkserver.nix b/lib/mkserver.nix index 1c2f884..7c7f4fe 100644 --- a/lib/mkserver.nix +++ b/lib/mkserver.nix @@ -14,7 +14,7 @@ nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = defaultModules ++ [ - { config.facter.reportPath = ./node/${nodeName}/facter.json; } - ./node/${nodeName} + { config.facter.reportPath = ../nodes/${nodeName}/facter.json; } + ../nodes/${nodeName} ]; } diff --git a/node/backup.jras.nl/default.nix b/nodes/backup.jras.nl/default.nix index 2857536..2857536 100644 --- a/node/backup.jras.nl/default.nix +++ b/nodes/backup.jras.nl/default.nix diff --git a/node/backup.jras.nl/disk-config.nix b/nodes/backup.jras.nl/disk-config.nix index d075422..d075422 100644 --- a/node/backup.jras.nl/disk-config.nix +++ b/nodes/backup.jras.nl/disk-config.nix diff --git a/node/backup.jras.nl/facter.json b/nodes/backup.jras.nl/facter.json index 3adbbba..3adbbba 100644 --- a/node/backup.jras.nl/facter.json +++ b/nodes/backup.jras.nl/facter.json |