undo macvlan

This commit is contained in:
ari committed 2026-09-17 09:58:35 -04:00
1 parent a7b9273296
commit f2f79d8a4d
4 files changed
+12 -12

No files matched your search

Generated
+4 -4
View File
@@ -831,11 +831,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1789573245, "lastModified": 1789611307,
"narHash": "sha256-Uw1DJF/XubQrnzjPftoE6yBGIYKQ1UjMYpG6k2ye6VA=", "narHash": "sha256-iMt1eFWfXTYKTDdRvUGrVACU3GRTKUzpvxf87OPLhHU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e5f150b17e3ac19b3082246734741885fb141a2d", "rev": "f5f6a98152c7ce76deb4ed5246ebd5836d40c815",
"revCount": 18, "revCount": 22,
"type": "git", "type": "git",
"url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git" "url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git"
}, },
+8 -8
View File
@@ -96,18 +96,18 @@ in
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
"portainer_data:/data" "portainer_data:/data"
]; ];
# ports = [ ports = [
# "9443:9443" "9443:9443"
# "8000:8000" "8000:8000"
# ]; ];
networks = staticIp "10.0.101.5"; # networks = staticIp "10.0.101.5";
}; };
volumes = { volumes = {
portainer_data = { portainer_data = {
name = "portainer_data"; name = "portainer_data";
}; };
}; };
networks = macvlanNetwork; # networks = macvlanNetwork;
}; };
age.secrets.stack1.file = ../secrets/stack1.age; age.secrets.stack1.file = ../secrets/stack1.age;
@@ -115,14 +115,14 @@ in
enable = true; enable = true;
autoUpdate.enable = true; autoUpdate.enable = true;
composeFile = config.age.secrets.stack1.path; composeFile = config.age.secrets.stack1.path;
networks = macvlanNetwork; # networks = macvlanNetwork;
}; };
age.secrets.stack2.file = ../secrets/stack2.age; age.secrets.stack2.file = ../secrets/stack2.age;
skyg.nixos.common.container-services.stack2 = { skyg.nixos.common.container-services.stack2 = {
enable = true; enable = true;
autoUpdate.enable = true; autoUpdate.enable = true;
composeFile = config.age.secrets.stack2.path; composeFile = config.age.secrets.stack2.path;
networks = macvlanNetwork; # networks = macvlanNetwork;
}; };
# Scrypted backup timer (image auto-update handled by container-services autoUpdate) # Scrypted backup timer (image auto-update handled by container-services autoUpdate)
Binary file not shown.
Binary file not shown.