From e6e2fb04a45cd9ae330c5245d84a52dfa974cbd7 Mon Sep 17 00:00:00 2001 From: niten Date: Thu, 9 Dec 2021 09:12:54 -0800 Subject: [PATCH] Nice and working --- common/deployment.nix | 4 ++ deployments/informis/flake.lock | 104 ++++++++++++++++++------------ deployments/seattle/flake.lock | 109 +++++++++++++++++++------------- deployments/seattle/flake.nix | 11 +++- 4 files changed, 139 insertions(+), 89 deletions(-) diff --git a/common/deployment.nix b/common/deployment.nix index 350b151..5625f39 100644 --- a/common/deployment.nix +++ b/common/deployment.nix @@ -5,6 +5,10 @@ with inputs.nixpkgs.lib; let network = { inherit description; enableRollback = enable-rollback; + + storage.legacy = { + databasefile = "~/.nixops/deployments.nixops"; + }; }; }; diff --git a/deployments/informis/flake.lock b/deployments/informis/flake.lock index 7ffaaf1..68ce294 100644 --- a/deployments/informis/flake.lock +++ b/deployments/informis/flake.lock @@ -263,11 +263,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 +278,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 +315,11 @@ ] }, "locked": { - "lastModified": 1638137290, - "narHash": "sha256-8Kjzn0jr4arVDDaOQUtT7VFd1ir1SB1X1xp1OoLZduo=", + "lastModified": 1638377832, + "narHash": "sha256-MWZ5h1kdQQbYhr5FqgWkGJpXJhvz9cX6ZyNCXj/usYE=", "ref": "master", - "rev": "45cb2ae34407530496a30c6121cad976bd186fc5", - "revCount": 8, + "rev": "067392bc5f3f38028d7a11e97eefe36164e67fa7", + "revCount": 12, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -338,17 +338,17 @@ ] }, "locked": { - "lastModified": 1638137290, - "narHash": "sha256-8Kjzn0jr4arVDDaOQUtT7VFd1ir1SB1X1xp1OoLZduo=", + "lastModified": 1638377832, + "narHash": "sha256-MWZ5h1kdQQbYhr5FqgWkGJpXJhvz9cX6ZyNCXj/usYE=", "ref": "master", - "rev": "45cb2ae34407530496a30c6121cad976bd186fc5", - "revCount": 8, + "rev": "067392bc5f3f38028d7a11e97eefe36164e67fa7", + "revCount": 12, "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,46 +362,62 @@ ] }, "locked": { - "narHash": "sha256-NCvYqgBq3HCqBx+EO1grdiflR9tthm9bUIasB4XtI4U=", - "path": "/state/nixops/fudo-home", - "type": "path" + "lastModified": 1638231222, + "narHash": "sha256-lvtfWFzAeK9YpNnuL28GMIoPCCimCFDI/M6BGq3e2BE=", + "ref": "master", + "rev": "9e5ca132cf4a353e78bb89d56ab0c8ca44ccce5e", + "revCount": 50, + "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": 1638315265, + "narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=", + "ref": "master", + "rev": "976d47cf2d723bf8aefb32780311faf75164abe3", + "revCount": 21, + "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": 1638315265, + "narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=", + "ref": "master", + "rev": "976d47cf2d723bf8aefb32780311faf75164abe3", + "revCount": 21, + "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=", - "path": "/state/fudo-lib", - "type": "path" + "lastModified": 1638315265, + "narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=", + "ref": "master", + "rev": "976d47cf2d723bf8aefb32780311faf75164abe3", + "revCount": 21, + "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-nixos": { @@ -416,7 +432,7 @@ ] }, "locked": { - "narHash": "sha256-2SeObQF/+f9x8b9+8H7YObtF5brfwTBOaAGXjeES8gY=", + "narHash": "sha256-aBzOCyjTffv6Dy/Ay6MtwodnRGoYzHoVpUonhLlNBrc=", "path": "/state/fudo-nixos", "type": "path" }, @@ -427,13 +443,17 @@ }, "fudo-pkgs": { "locked": { - "narHash": "sha256-XwEs/VkqJp1mNwYUeBUqCPrW6GUEwAxbXMVOy7bF2P8=", - "path": "/state/nixops/fudo-pkgs", - "type": "path" + "lastModified": 1637050187, + "narHash": "sha256-E1Xz7MLL/ZZZcxVd/7VycBC0N/zFz+OjIHx2h0ki+Fo=", + "ref": "master", + "rev": "4dc41229084416562eb12d02c84020fb3800d96b", + "revCount": 17, + "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": { diff --git a/deployments/seattle/flake.lock b/deployments/seattle/flake.lock index 21fcadd..7f9f833 100644 --- a/deployments/seattle/flake.lock +++ b/deployments/seattle/flake.lock @@ -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": 1638317485, - "narHash": "sha256-L/lOrVjZAqwoC/gw/9BGdSK1YK0/Sl7VorBJgOd4gGk=", + "lastModified": 1639000475, + "narHash": "sha256-k/InAUmSfca0T1e+GyQbvuNez8wRY+43loR+YgunuxA=", "ref": "master", - "rev": "3dfcf3985223782c798fe5aab33d89e2eb78c370", - "revCount": 9, + "rev": "4984db90e84d31879f789b0eb5f91cc6b18e94b0", + "revCount": 15, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git" }, @@ -338,11 +350,11 @@ ] }, "locked": { - "lastModified": 1638317485, - "narHash": "sha256-L/lOrVjZAqwoC/gw/9BGdSK1YK0/Sl7VorBJgOd4gGk=", + "lastModified": 1639000475, + "narHash": "sha256-k/InAUmSfca0T1e+GyQbvuNez8wRY+43loR+YgunuxA=", "ref": "master", - "rev": "3dfcf3985223782c798fe5aab33d89e2eb78c370", - "revCount": 9, + "rev": "4984db90e84d31879f789b0eb5f91cc6b18e94b0", + "revCount": 15, "type": "git", "url": "https://git.fudo.org/fudo-nix/entities.git" }, @@ -362,11 +374,11 @@ ] }, "locked": { - "lastModified": 1638231222, - "narHash": "sha256-lvtfWFzAeK9YpNnuL28GMIoPCCimCFDI/M6BGq3e2BE=", + "lastModified": 1638991415, + "narHash": "sha256-dRK4vyqMSJo4bXoKtynNPwHGoNzWAevnscIFwJIqQI0=", "ref": "master", - "rev": "9e5ca132cf4a353e78bb89d56ab0c8ca44ccce5e", - "revCount": 50, + "rev": "f0bb0be7c5250097858e74b283bb7bc082c3254d", + "revCount": 53, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -377,33 +389,41 @@ }, "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": { - "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" }, @@ -424,11 +444,11 @@ ] }, "locked": { - "lastModified": 1638317530, - "narHash": "sha256-mz8zv2UJB06A1t2q3ZNiTjBMzSMo+95GpD7qZt7qqBk=", + "lastModified": 1639002003, + "narHash": "sha256-UORO94EJcJDpNUq+CEYejdZJmm7aCGV4AwFehnM+Vds=", "ref": "master", - "rev": "9ae99f0894a55671f11694873a5488779e9ce74e", - "revCount": 396, + "rev": "a17886e8e74fbb6978cbd341d1199fdc0aee3f9b", + "revCount": 410, "type": "git", "url": "ssh://fudo_git@git.fudo.org:2222/fudo-nix/nixos-config.git" }, @@ -505,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" } @@ -593,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" } }, @@ -744,6 +764,7 @@ }, "root": { "inputs": { + "deployment-common": "deployment-common", "fudo-entities": "fudo-entities", "fudo-nixos": "fudo-nixos", "fudo-secrets": "fudo-secrets_2", diff --git a/deployments/seattle/flake.nix b/deployments/seattle/flake.nix index 1708801..a3954cf 100644 --- a/deployments/seattle/flake.nix +++ b/deployments/seattle/flake.nix @@ -2,7 +2,7 @@ description = "Seattle Fudo NixOps network."; inputs = { - nixpkgs.url = "nixpkgs/nixos-21.05"; + nixpkgs.url = "nixpkgs/nixos-21.11"; fudo-secrets.url = "path:/state/secrets"; @@ -15,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 = "sea.fudo.org"; @@ -30,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; };