Various changes
This commit is contained in:
parent
e6e2fb04a4
commit
d6f87490f5
|
|
@ -48,6 +48,18 @@
|
|||
"type": "path"
|
||||
}
|
||||
},
|
||||
"deployment-common": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-+OirrRnBKlLiJmIKpuob37LzGKUuyqQJf/T2hL1hGbE=",
|
||||
"path": "../../common",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "../../common",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"dnssec-keys": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -263,11 +275,11 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1637014545,
|
||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
||||
"lastModified": 1638122382,
|
||||
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
|
||||
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -278,11 +290,11 @@
|
|||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1637014545,
|
||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
||||
"lastModified": 1638122382,
|
||||
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
|
||||
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -315,11 +327,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638137290,
|
||||
"narHash": "sha256-8Kjzn0jr4arVDDaOQUtT7VFd1ir1SB1X1xp1OoLZduo=",
|
||||
"lastModified": 1639382367,
|
||||
"narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=",
|
||||
"ref": "master",
|
||||
"rev": "45cb2ae34407530496a30c6121cad976bd186fc5",
|
||||
"revCount": 8,
|
||||
"rev": "ea5ad17ed043496217fa940495b9c215bf7f0339",
|
||||
"revCount": 23,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -338,17 +350,17 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638137290,
|
||||
"narHash": "sha256-8Kjzn0jr4arVDDaOQUtT7VFd1ir1SB1X1xp1OoLZduo=",
|
||||
"lastModified": 1639382367,
|
||||
"narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=",
|
||||
"ref": "master",
|
||||
"rev": "45cb2ae34407530496a30c6121cad976bd186fc5",
|
||||
"revCount": 8,
|
||||
"rev": "ea5ad17ed043496217fa940495b9c215bf7f0339",
|
||||
"revCount": 23,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/nix/fudo-entities.git"
|
||||
"url": "https://git.fudo.org/fudo-nix/entities.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/nix/fudo-entities.git"
|
||||
"url": "https://git.fudo.org/fudo-nix/entities.git"
|
||||
}
|
||||
},
|
||||
"fudo-home": {
|
||||
|
|
@ -362,40 +374,52 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-NCvYqgBq3HCqBx+EO1grdiflR9tthm9bUIasB4XtI4U=",
|
||||
"path": "/state/nixops/fudo-home",
|
||||
"type": "path"
|
||||
"lastModified": 1639073015,
|
||||
"narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=",
|
||||
"ref": "master",
|
||||
"rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8",
|
||||
"revCount": 54,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/home.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/nixops/fudo-home",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/home.git"
|
||||
}
|
||||
},
|
||||
"fudo-lib": {
|
||||
"locked": {
|
||||
"narHash": "sha256-r8qffvJPWbBJmN32thMIxjdmY9X5VCc3TuyQyFAIdks=",
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
}
|
||||
},
|
||||
"fudo-lib_2": {
|
||||
"locked": {
|
||||
"narHash": "sha256-r8qffvJPWbBJmN32thMIxjdmY9X5VCc3TuyQyFAIdks=",
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
}
|
||||
},
|
||||
"fudo-lib_3": {
|
||||
"locked": {
|
||||
"narHash": "sha256-O2CsIArXcPyiBtDbAiFNU2IvIBTqEljrwDJkGF0STbw=",
|
||||
"narHash": "sha256-59rmsqpFdwXog4jNcplbDTaPw/iVw4xnJ9DRhUsjLWc=",
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -416,28 +440,28 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638251788,
|
||||
"narHash": "sha256-JzsjH4L25cXv/mpm/JK7z34hUKDrXVWP2HMbY6FRnv0=",
|
||||
"ref": "master",
|
||||
"rev": "a1d4e2aeb4006b778e31caec0407173af9ca8fa6",
|
||||
"revCount": 390,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"
|
||||
"narHash": "sha256-l/4EWeXD7t47TWIVRWP79TgJFX7bhyHApa6YXWjq2JQ=",
|
||||
"path": "/state/fudo-nixos",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"
|
||||
"path": "/state/fudo-nixos",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"fudo-pkgs": {
|
||||
"locked": {
|
||||
"narHash": "sha256-XwEs/VkqJp1mNwYUeBUqCPrW6GUEwAxbXMVOy7bF2P8=",
|
||||
"path": "/state/nixops/fudo-pkgs",
|
||||
"type": "path"
|
||||
"lastModified": 1639072539,
|
||||
"narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=",
|
||||
"ref": "master",
|
||||
"rev": "99319e33c6e17476225c1d939e656c6ae6c8152f",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/nixops/fudo-pkgs",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
}
|
||||
},
|
||||
"fudo-secrets": {
|
||||
|
|
@ -453,7 +477,7 @@
|
|||
"ssh-keypairs": "ssh-keypairs"
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=",
|
||||
"narHash": "sha256-BHRAUrDwfKB0OzFRABqRCbsQ9dteeg5a5Uf4mvfjG20=",
|
||||
"path": "/state/secrets",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -475,7 +499,7 @@
|
|||
"ssh-keypairs": "ssh-keypairs_2"
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=",
|
||||
"narHash": "sha256-BHRAUrDwfKB0OzFRABqRCbsQ9dteeg5a5Uf4mvfjG20=",
|
||||
"path": "/state/secrets",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -493,16 +517,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1637019201,
|
||||
"narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=",
|
||||
"lastModified": 1638553958,
|
||||
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1",
|
||||
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-21.05",
|
||||
"ref": "release-21.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -510,7 +534,7 @@
|
|||
"host-keytabs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=",
|
||||
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=",
|
||||
"path": "/state/secrets/kerberos/host-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -522,7 +546,7 @@
|
|||
"host-keytabs_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=",
|
||||
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=",
|
||||
"path": "/state/secrets/kerberos/host-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -581,16 +605,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1638196344,
|
||||
"narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=",
|
||||
"lastModified": 1639161226,
|
||||
"narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f",
|
||||
"rev": "573095944e7c1d58d30fc679c81af63668b54056",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-21.05",
|
||||
"ref": "nixos-21.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
|
|
@ -732,6 +756,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"deployment-common": "deployment-common",
|
||||
"fudo-entities": "fudo-entities",
|
||||
"fudo-nixos": "fudo-nixos",
|
||||
"fudo-secrets": "fudo-secrets_2",
|
||||
|
|
@ -757,7 +782,7 @@
|
|||
"service-keytabs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=",
|
||||
"narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=",
|
||||
"path": "/state/secrets/kerberos/service-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -769,7 +794,7 @@
|
|||
"service-keytabs_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=",
|
||||
"narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=",
|
||||
"path": "/state/secrets/kerberos/service-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
description = "Fudo NixOps network.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-21.05";
|
||||
nixpkgs.url = "nixpkgs/nixos-21.11";
|
||||
|
||||
fudo-secrets.url = "path:/state/secrets";
|
||||
|
||||
fudo-nixos = {
|
||||
url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git";
|
||||
# url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git";
|
||||
url = "path:/state/fudo-nixos";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -15,9 +16,14 @@
|
|||
url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
deployment-common = {
|
||||
url = "path:../../common";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets } @ inputs:
|
||||
outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets, deployment-common } @ inputs:
|
||||
with nixpkgs.lib; {
|
||||
nixopsConfigurations.default = let
|
||||
description = "Fudo NixOps Network";
|
||||
|
|
@ -32,7 +38,7 @@
|
|||
fudo-entities.entities.hosts;
|
||||
|
||||
deployment-config-generator =
|
||||
import ../../common/deployment.nix;
|
||||
import "${deployment-common}/deployment.nix";
|
||||
in deployment-config-generator {
|
||||
inherit inputs deployment-hosts description;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,6 +48,18 @@
|
|||
"type": "path"
|
||||
}
|
||||
},
|
||||
"deployment-common": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-+OirrRnBKlLiJmIKpuob37LzGKUuyqQJf/T2hL1hGbE=",
|
||||
"path": "../../common",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "../../common",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"dnssec-keys": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -315,11 +327,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638377832,
|
||||
"narHash": "sha256-MWZ5h1kdQQbYhr5FqgWkGJpXJhvz9cX6ZyNCXj/usYE=",
|
||||
"lastModified": 1639074482,
|
||||
"narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=",
|
||||
"ref": "master",
|
||||
"rev": "067392bc5f3f38028d7a11e97eefe36164e67fa7",
|
||||
"revCount": 12,
|
||||
"rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -338,11 +350,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638377832,
|
||||
"narHash": "sha256-MWZ5h1kdQQbYhr5FqgWkGJpXJhvz9cX6ZyNCXj/usYE=",
|
||||
"lastModified": 1639074482,
|
||||
"narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=",
|
||||
"ref": "master",
|
||||
"rev": "067392bc5f3f38028d7a11e97eefe36164e67fa7",
|
||||
"revCount": 12,
|
||||
"rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -362,11 +374,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638231222,
|
||||
"narHash": "sha256-lvtfWFzAeK9YpNnuL28GMIoPCCimCFDI/M6BGq3e2BE=",
|
||||
"lastModified": 1639073015,
|
||||
"narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=",
|
||||
"ref": "master",
|
||||
"rev": "9e5ca132cf4a353e78bb89d56ab0c8ca44ccce5e",
|
||||
"revCount": 50,
|
||||
"rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8",
|
||||
"revCount": 54,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/home.git"
|
||||
},
|
||||
|
|
@ -377,11 +389,11 @@
|
|||
},
|
||||
"fudo-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1638315265,
|
||||
"narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=",
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "976d47cf2d723bf8aefb32780311faf75164abe3",
|
||||
"revCount": 21,
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
|
|
@ -392,11 +404,11 @@
|
|||
},
|
||||
"fudo-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1638315265,
|
||||
"narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=",
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "976d47cf2d723bf8aefb32780311faf75164abe3",
|
||||
"revCount": 21,
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
|
|
@ -407,11 +419,11 @@
|
|||
},
|
||||
"fudo-lib_3": {
|
||||
"locked": {
|
||||
"lastModified": 1638315265,
|
||||
"narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=",
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "976d47cf2d723bf8aefb32780311faf75164abe3",
|
||||
"revCount": 21,
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
|
|
@ -432,22 +444,26 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-aBzOCyjTffv6Dy/Ay6MtwodnRGoYzHoVpUonhLlNBrc=",
|
||||
"path": "/state/fudo-nixos",
|
||||
"type": "path"
|
||||
"lastModified": 1639074662,
|
||||
"narHash": "sha256-n8qH2DiT7EOuGAeyRCZyhUGpzoH7AP2/UYj8LzNpBOM=",
|
||||
"ref": "master",
|
||||
"rev": "981da8bb98867c2b32994a6a0f678698848e6d19",
|
||||
"revCount": 417,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"
|
||||
},
|
||||
"original": {
|
||||
"path": "/state/fudo-nixos",
|
||||
"type": "path"
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"
|
||||
}
|
||||
},
|
||||
"fudo-pkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1637050187,
|
||||
"narHash": "sha256-E1Xz7MLL/ZZZcxVd/7VycBC0N/zFz+OjIHx2h0ki+Fo=",
|
||||
"lastModified": 1639072539,
|
||||
"narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=",
|
||||
"ref": "master",
|
||||
"rev": "4dc41229084416562eb12d02c84020fb3800d96b",
|
||||
"revCount": 17,
|
||||
"rev": "99319e33c6e17476225c1d939e656c6ae6c8152f",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
},
|
||||
|
|
@ -509,16 +525,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1637019201,
|
||||
"narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=",
|
||||
"lastModified": 1638553958,
|
||||
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1",
|
||||
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-21.05",
|
||||
"ref": "release-21.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -597,16 +613,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1638196344,
|
||||
"narHash": "sha256-fkOqSkfOkl8tqxDd+zJU4kAgyLXp/ouaP+U9gpjEZZs=",
|
||||
"lastModified": 1638887115,
|
||||
"narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2553aee74fed8c2205a4aeb3ffd206ca14ede60f",
|
||||
"rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-21.05",
|
||||
"ref": "nixos-21.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
|
|
@ -748,6 +764,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"deployment-common": "deployment-common",
|
||||
"fudo-entities": "fudo-entities",
|
||||
"fudo-nixos": "fudo-nixos",
|
||||
"fudo-secrets": "fudo-secrets_2",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@
|
|||
description = "Informis NixOps network.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-21.05";
|
||||
nixpkgs.url = "nixpkgs/nixos-21.11";
|
||||
|
||||
fudo-secrets.url = "path:/state/secrets";
|
||||
|
||||
fudo-nixos = {
|
||||
#url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git";
|
||||
url = "path:/state/fudo-nixos";
|
||||
url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -16,9 +15,14 @@
|
|||
url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
deployment-common = {
|
||||
url = "path:../../common";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets } @ inputs:
|
||||
outputs = { self, nixpkgs, fudo-nixos, fudo-entities, fudo-secrets, deployment-common } @ inputs:
|
||||
with nixpkgs.lib; {
|
||||
nixopsConfigurations.default = let
|
||||
domain = "informis.land";
|
||||
|
|
@ -31,7 +35,7 @@
|
|||
fudo-entities.entities.hosts;
|
||||
|
||||
deployment-config-generator =
|
||||
import ../../common/deployment.nix;
|
||||
import "${deployment-common}/deployment.nix";
|
||||
in deployment-config-generator {
|
||||
inherit inputs deployment-hosts description;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -327,11 +327,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639000475,
|
||||
"narHash": "sha256-k/InAUmSfca0T1e+GyQbvuNez8wRY+43loR+YgunuxA=",
|
||||
"lastModified": 1639382367,
|
||||
"narHash": "sha256-Zz3c14UXRdDR4m0mz9LLnqpa1bw1jxNHaFB/Zp715xI=",
|
||||
"ref": "master",
|
||||
"rev": "4984db90e84d31879f789b0eb5f91cc6b18e94b0",
|
||||
"revCount": 15,
|
||||
"rev": "ea5ad17ed043496217fa940495b9c215bf7f0339",
|
||||
"revCount": 23,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -350,11 +350,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639000475,
|
||||
"narHash": "sha256-k/InAUmSfca0T1e+GyQbvuNez8wRY+43loR+YgunuxA=",
|
||||
"lastModified": 1639074482,
|
||||
"narHash": "sha256-diaAXDKP89pdcmHV7sc/a4FAE7G4xL2qvKKcinI1K7g=",
|
||||
"ref": "master",
|
||||
"rev": "4984db90e84d31879f789b0eb5f91cc6b18e94b0",
|
||||
"revCount": 15,
|
||||
"rev": "7c094f43c4009d9e4d3e2588f50d93ca054eeb9a",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/entities.git"
|
||||
},
|
||||
|
|
@ -374,11 +374,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638991415,
|
||||
"narHash": "sha256-dRK4vyqMSJo4bXoKtynNPwHGoNzWAevnscIFwJIqQI0=",
|
||||
"lastModified": 1639073015,
|
||||
"narHash": "sha256-F9KuMZNZjyQx4+JxH8QWhtPQlCJCRscjvWknsxYWus4=",
|
||||
"ref": "master",
|
||||
"rev": "f0bb0be7c5250097858e74b283bb7bc082c3254d",
|
||||
"revCount": 53,
|
||||
"rev": "8ccd875d048ec7cad944a080a24d59d36b4f8cb8",
|
||||
"revCount": 54,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/home.git"
|
||||
},
|
||||
|
|
@ -419,17 +419,13 @@
|
|||
},
|
||||
"fudo-lib_3": {
|
||||
"locked": {
|
||||
"lastModified": 1638990149,
|
||||
"narHash": "sha256-p1T0GMJXIJvTpVdn5nK7RZJX8izkabADJ/LsaL442zI=",
|
||||
"ref": "master",
|
||||
"rev": "c87448ff1365c3d5230690f68d1ba246652581d1",
|
||||
"revCount": 24,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
"narHash": "sha256-59rmsqpFdwXog4jNcplbDTaPw/iVw4xnJ9DRhUsjLWc=",
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
"path": "/state/fudo-lib",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"fudo-nixos": {
|
||||
|
|
@ -444,11 +440,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639002003,
|
||||
"narHash": "sha256-UORO94EJcJDpNUq+CEYejdZJmm7aCGV4AwFehnM+Vds=",
|
||||
"lastModified": 1639356587,
|
||||
"narHash": "sha256-zJb7Wfg6ThIUDKJCNM3UmdXSNeJGKChSMGrJAkmXB3Y=",
|
||||
"ref": "master",
|
||||
"rev": "a17886e8e74fbb6978cbd341d1199fdc0aee3f9b",
|
||||
"revCount": 410,
|
||||
"rev": "5a0b508eccdfb906f5b24270aa62887820f0fd1f",
|
||||
"revCount": 419,
|
||||
"type": "git",
|
||||
"url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git"
|
||||
},
|
||||
|
|
@ -459,11 +455,11 @@
|
|||
},
|
||||
"fudo-pkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1637050187,
|
||||
"narHash": "sha256-E1Xz7MLL/ZZZcxVd/7VycBC0N/zFz+OjIHx2h0ki+Fo=",
|
||||
"lastModified": 1639072539,
|
||||
"narHash": "sha256-ezF6GF5JaJgQ7C4ZbzK4VWXl8DrDRO1gsvv/SOckmZ8=",
|
||||
"ref": "master",
|
||||
"rev": "4dc41229084416562eb12d02c84020fb3800d96b",
|
||||
"revCount": 17,
|
||||
"rev": "99319e33c6e17476225c1d939e656c6ae6c8152f",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
|
||||
},
|
||||
|
|
@ -507,7 +503,7 @@
|
|||
"ssh-keypairs": "ssh-keypairs_2"
|
||||
},
|
||||
"locked": {
|
||||
"narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=",
|
||||
"narHash": "sha256-m0Gk8MgLEl94HREQKZ95xxqBCFrqPLNShZsLb9rGWF0=",
|
||||
"path": "/state/secrets",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -554,7 +550,7 @@
|
|||
"host-keytabs_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-LzDfB9ubACWyQzjXzsPH6eNoESmSVcMFFb3V025Xgow=",
|
||||
"narHash": "sha256-LAAZVfwD65yS6H7EcKmfiPXtLcfRQ80u3V4LFRjr7ko=",
|
||||
"path": "/state/secrets/kerberos/host-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -613,11 +609,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1638887115,
|
||||
"narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=",
|
||||
"lastModified": 1639161226,
|
||||
"narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65",
|
||||
"rev": "573095944e7c1d58d30fc679c81af63668b54056",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -802,7 +798,7 @@
|
|||
"service-keytabs_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-9lw22Gh1IDX+MtXMLi+o3XbjvqEhOiZQG9FiG/xz/U0=",
|
||||
"narHash": "sha256-0gpaf5j/Uxy6HUXDLt0T7vg4Z2aic1IHhuNUO5IcOhY=",
|
||||
"path": "/state/secrets/kerberos/service-keytabs",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue