mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-10 23:00:39 +02:00
feat: make virtiofsd tags short and friendly to not upset the software
with oh-so-bad long strings with underscores
This commit is contained in:
parent
66c1c9d72d
commit
d5304bbe2b
6 changed files with 9 additions and 7 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -405,11 +405,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703273523,
|
||||
"narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=",
|
||||
"lastModified": 1703274528,
|
||||
"narHash": "sha256-r5y1DmRxlKF3rlJoIULeq1lGVGWbTZxmNGlQ0jW8ZjQ=",
|
||||
"owner": "oddlama",
|
||||
"repo": "nixos-extra-modules",
|
||||
"rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd",
|
||||
"rev": "f4a871a401059ff0662ef86a059742d47d45a5bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
Binary file not shown.
|
@ -71,7 +71,7 @@ in {
|
|||
_: zfsCfg: {
|
||||
source = zfsCfg.hostMountpoint;
|
||||
mountPoint = zfsCfg.guestMountpoint;
|
||||
tag = lib.replaceStrings ["/"] ["_"] zfsCfg.hostMountpoint;
|
||||
tag = builtins.substring 0 16 (builtins.hashString "sha256" zfsCfg.hostMountpoint);
|
||||
proto = "virtiofs";
|
||||
}
|
||||
);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
minimal,
|
||||
nodes,
|
||||
...
|
||||
}: let
|
||||
|
@ -23,7 +24,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkIf (!minimal && cfg.enable) {
|
||||
age.secrets.promtail-loki-basic-auth-password = {
|
||||
generator.script = "alnum";
|
||||
mode = "440";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
minimal,
|
||||
nodes,
|
||||
pkgs,
|
||||
...
|
||||
|
@ -56,7 +57,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkIf (!minimal && cfg.enable) {
|
||||
nodes.${cfg.influxdb2.node} = {
|
||||
# Mirror the original secret on the influx host
|
||||
age.secrets."telegraf-influxdb-token-${config.node.name}" = {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
installer-package = pkgs.symlinkJoin {
|
||||
name = "installer-package-${nodeName}";
|
||||
paths = with pkgs; [
|
||||
paths = [
|
||||
disko-script
|
||||
disko-mount
|
||||
disko-format
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue