Misc cleanups
This commit is contained in:
parent
72f09244c4
commit
24db48cf08
|
@ -184,6 +184,12 @@ creation_rules:
|
||||||
age:
|
age:
|
||||||
- *hydra
|
- *hydra
|
||||||
- *polygon-snowflake
|
- *polygon-snowflake
|
||||||
|
- path_regex: hosts/jabber/[^/]+\.yaml$
|
||||||
|
key_groups:
|
||||||
|
- pgp: *admins
|
||||||
|
age:
|
||||||
|
- *jabber
|
||||||
|
- *polygon-snowflake
|
||||||
- path_regex: hosts/kibana/[^/]+\.yaml$
|
- path_regex: hosts/kibana/[^/]+\.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
- pgp: *admins
|
- pgp: *admins
|
||||||
|
|
16
flake.lock
16
flake.lock
|
@ -565,11 +565,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659890996,
|
"lastModified": 1672093526,
|
||||||
"narHash": "sha256-xURgGoznCPmpX35dn5AXcyNYicVn5ruvUKxfIMMiu8o=",
|
"narHash": "sha256-Kfk76cgPLsLqEDxhj6tSjXsE+LX/ak7zD6uhvTK0jUU=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "5ca106f648bef15d9954d956bda336eea28e8d75",
|
"rev": "289f14e0f3a115950fff4c3ac87ba373f5950295",
|
||||||
"revCount": 149,
|
"revCount": 151,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
|
"url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
|
||||||
},
|
},
|
||||||
|
@ -773,11 +773,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1671823052,
|
"lastModified": 1672094890,
|
||||||
"narHash": "sha256-uyutoJLPEHbn3vL0Oo5FWPyy0jAFvE9B1kRka8UFJ/I=",
|
"narHash": "sha256-8tkgoE9sdkWFBUv1DSb2JqHLGruEvRVuyIlTA1WawCA=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "b4a363e05db4783f70621cfd6bdabefc2cf03bdf",
|
"rev": "14bdeccb453b7faafe53f656cdf8d439308d34b8",
|
||||||
"revCount": 1712,
|
"revCount": 1713,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
|
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
|
||||||
},
|
},
|
||||||
|
|
|
@ -224,6 +224,7 @@
|
||||||
) result (builtins.attrNames hosts6."${ctx}")
|
) result (builtins.attrNames hosts6."${ctx}")
|
||||||
) {} (builtins.attrNames hosts6)
|
) {} (builtins.attrNames hosts6)
|
||||||
);
|
);
|
||||||
|
|
||||||
hostRegistry =
|
hostRegistry =
|
||||||
builtins.foldl' (result: net:
|
builtins.foldl' (result: net:
|
||||||
lib.recursiveUpdate result (extractZwHosts zentralwerk.lib.config.site.net."${net}")
|
lib.recursiveUpdate result (extractZwHosts zentralwerk.lib.config.site.net."${net}")
|
||||||
|
@ -273,6 +274,8 @@
|
||||||
self.overlays
|
self.overlays
|
||||||
]) nixos.legacyPackages;
|
]) nixos.legacyPackages;
|
||||||
|
|
||||||
|
lib = { inherit hostRegistry; };
|
||||||
|
|
||||||
packages = import ./packages.nix { inherit hostRegistry inputs lib microvm secrets self; };
|
packages = import ./packages.nix { inherit hostRegistry inputs lib microvm secrets self; };
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
@ -298,6 +301,7 @@
|
||||||
./hosts/blogs
|
./hosts/blogs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
broker = nixosSystem' {
|
broker = nixosSystem' {
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.microvm
|
self.nixosModules.microvm
|
||||||
|
|
Loading…
Reference in New Issue
Block a user