mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

feat: make virtiofsd tags short and friendly to not upset the software

Browse source 
with oh-so-bad long strings with underscores
This commit is contained in:
oddlama 2023-12-23 00:07:03 +01:00
parent 66c1c9d72d
commit d5304bbe2b
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
6 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -405,11 +405,11 @@
"pre-commit-hooks": "pre-commit-hooks_3" "pre-commit-hooks": "pre-commit-hooks_3"
}, },
"locked": { "locked": {
"lastModified": 1703273523, "lastModified": 1703274528,
"narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=", "narHash": "sha256-r5y1DmRxlKF3rlJoIULeq1lGVGWbTZxmNGlQ0jW8ZjQ=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nixos-extra-modules", "repo": "nixos-extra-modules",
"rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd", "rev": "f4a871a401059ff0662ef86a059742d47d45a5bc",
"type": "github" "type": "github"
}, },
"original": { "original": {

BIN
hosts/sentinel/secrets/local.nix.age
View file

Binary file not shown.

2
modules/guests/microvm.nix
View file

@ -71,7 +71,7 @@ in {
_: zfsCfg: { _: zfsCfg: {
source = zfsCfg.hostMountpoint; source = zfsCfg.hostMountpoint;
mountPoint = zfsCfg.guestMountpoint; mountPoint = zfsCfg.guestMountpoint;
tag = lib.replaceStrings ["/"] ["_"] zfsCfg.hostMountpoint; tag = builtins.substring 0 16 (builtins.hashString "sha256" zfsCfg.hostMountpoint);
proto = "virtiofs"; proto = "virtiofs";
} }
); );

3
modules/promtail.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
minimal,
nodes, nodes,
... ...
}: let }: let
@ -23,7 +24,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf (!minimal && cfg.enable) {
age.secrets.promtail-loki-basic-auth-password = { age.secrets.promtail-loki-basic-auth-password = {
generator.script = "alnum"; generator.script = "alnum";
mode = "440"; mode = "440";

3
modules/telegraf.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
minimal,
nodes, nodes,
pkgs, pkgs,
... ...
@ -56,7 +57,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf (!minimal && cfg.enable) {
nodes.${cfg.influxdb2.node} = { nodes.${cfg.influxdb2.node} = {
# Mirror the original secret on the influx host # Mirror the original secret on the influx host
age.secrets."telegraf-influxdb-token-${config.node.name}" = { age.secrets."telegraf-influxdb-token-${config.node.name}" = {

2
nix/generate-installer-package.nix
View file

@ -20,7 +20,7 @@
installer-package = pkgs.symlinkJoin { installer-package = pkgs.symlinkJoin {
name = "installer-package-${nodeName}"; name = "installer-package-${nodeName}";
paths = with pkgs; [ paths = [
disko-script disko-script
disko-mount disko-mount
disko-format disko-format