Added build-seed
This commit is contained in:
Generated
+25
-12
@@ -226,11 +226,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1634504012,
|
||||
"narHash": "sha256-MbU+ZDyp+sxaFMBs0QH04nieh3vvyC9lzSn9fDk1+zM=",
|
||||
"lastModified": 1635528550,
|
||||
"narHash": "sha256-q+ZMD+VmZHz9TazccHQvEdttdxWgKtm5ldDt+w4jpFU=",
|
||||
"ref": "flake",
|
||||
"rev": "1ba24b9571aaad13bc91e27fce0096a66bdcb677",
|
||||
"revCount": 37,
|
||||
"rev": "7d7f95b1c229ceed825559f1f94ee6f676b429a6",
|
||||
"revCount": 38,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/niten/nix-home.git"
|
||||
},
|
||||
@@ -243,7 +243,7 @@
|
||||
"fudo-nixos": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-rZspm5MJjkiXONo7L9lsJqB2QZXoo/Wqs9+lODUkia8=",
|
||||
"narHash": "sha256-QYhuo67dvvLdy8RD3gGWCzBG4azEZTuY8vLICu1N32s=",
|
||||
"path": "/state/nixops/fudo-nixos",
|
||||
"type": "path"
|
||||
},
|
||||
@@ -273,11 +273,12 @@
|
||||
"build-keypairs": "build-keypairs",
|
||||
"filesystem-keys": "filesystem-keys",
|
||||
"host-keytabs": "host-keytabs",
|
||||
"service-keytabs": "service-keytabs",
|
||||
"service-passwords": "service-passwords",
|
||||
"ssh-keypairs": "ssh-keypairs"
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-TOBI3TVEHR97j7/Rf41P4QCpbL9XamHkHQHi3BhBdi4=",
|
||||
"narHash": "sha256-0L3GFcBuGWbPyz5GUj9jX+ENtPx/U2rcMzO3yCDSq1M=",
|
||||
"path": "/state/secrets",
|
||||
"type": "path"
|
||||
},
|
||||
@@ -311,7 +312,7 @@
|
||||
"host-keytabs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-QBfphmEdsPyzOSQxi1p+fZkpLXxXrWNQv1v5tnW0F+4=",
|
||||
"narHash": "sha256-+4bPq8vQIaBsMXXcuw41yLTxe6e/Yy80NlCdrabEPCM=",
|
||||
"path": "./kerberos/host-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
@@ -370,11 +371,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1634327140,
|
||||
"narHash": "sha256-d5L7oMjUVC6VU0cQMsF0tceAPkmzuAQ51DWBFNChbEQ=",
|
||||
"lastModified": 1635456205,
|
||||
"narHash": "sha256-CLZxFvwec8BhFlB5tkIq08UBDNNrijOY780UF6ubJXc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "83667ff60a88e22b76ef4b0bdf5334670b39c2b6",
|
||||
"rev": "66d6ec6ed2ddc77d08cf677cc8230db39f051793",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -520,10 +521,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"service-keytabs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-F2npNGjUglGumazLFj9qQABGradbwCnKYZn8BEGweJc=",
|
||||
"path": "./kerberos/service-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "./kerberos/service-keytabs",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"service-passwords": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-JPMZdokzw+vyWoIKwgDhD60BYi5gch/MfgQyvx5AXZA=",
|
||||
"narHash": "sha256-QF809kxBsyAfshBlm3GLUFaxk5KbU8cIn8v/gY9C9c8=",
|
||||
"path": "./service-passwords",
|
||||
"type": "path"
|
||||
},
|
||||
@@ -535,7 +548,7 @@
|
||||
"ssh-keypairs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-fD2ZTNMc399XtlVWLCU4crC0RZZ8yTZPFzEm9VWjiL8=",
|
||||
"narHash": "sha256-HE2nCM6p8hhoLu7JFOaVimzC3XIZfgCT4WHgnp+wqm0=",
|
||||
"path": "./ssh-keypairs",
|
||||
"type": "path"
|
||||
},
|
||||
|
||||
+15
-2
@@ -64,16 +64,29 @@
|
||||
} // (nixpkgs.lib.mapAttrs (hostname: hostOpts: let
|
||||
system = hostOpts.arch;
|
||||
profile = hostOpts.profile;
|
||||
in { config, pkgs, lib, ... }: {
|
||||
in { config, ... }: let
|
||||
pkgs = pkgs-for system;
|
||||
lib = pkgs.lib;
|
||||
build-seed = builtins.readFile config.fudo.secrets.files.build-seed;
|
||||
in {
|
||||
imports = [
|
||||
fudo-home.nixosModule
|
||||
fudo-secrets.nixosModule
|
||||
(initialize-host {
|
||||
inherit hostname build-timestamp site domain profile;
|
||||
inherit
|
||||
lib
|
||||
pkgs
|
||||
hostname
|
||||
build-timestamp
|
||||
build-seed
|
||||
site
|
||||
domain
|
||||
profile;
|
||||
})
|
||||
];
|
||||
|
||||
nixpkgs.pkgs = pkgs-for system;
|
||||
nixpkgs.lib = (pkgs-for system).lib;
|
||||
|
||||
deployment = with lib; {
|
||||
targetHost = network-hosts.${hostname}.ipv4-address;
|
||||
|
||||
Reference in New Issue
Block a user