From 34417fb7bc64de49a46c905bb40e2d17173926b4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 16 Aug 2024 15:52:33 +0200 Subject: [PATCH 1/3] nix/os/devices/sj-srv1: bump versions --- nix/os/devices/sj-srv1/flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 5985819..75efad0 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1722006690, - "narHash": "sha256-Y84/ZDxUvJhRDaqM67VjHyAbZ26j9/XRKH/zN9fGRBU=", + "lastModified": 1723816116, + "narHash": "sha256-EjAHH2CHixotYKJ39gC8kLuYKy2QUeOKgjLVD1xaROU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb7d08ac86ae13fad7166d6082a2d8d0582c6ef3", + "rev": "a800d4bb3ffebe4219b60bd5c81e53a323f72627", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721973884, - "narHash": "sha256-Vsn2P1YOFzxMog3Iefy9Ky9KW+PvipnaT/kkVyOKLWg=", + "lastModified": 1723764322, + "narHash": "sha256-1V4C7f7sUjslxreqbpvBzitl9I2nY7nOrR17DjnatcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a8e77c70685d5bb20aaafe1422888e33b4ae9f2", + "rev": "03bd12dcf88b6aabc047fbf909bda4c7e344416c", "type": "github" }, "original": { From 547e0f6305a36c2a9f2a6024d69bec59e5f9c5e1 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 16 Aug 2024 16:29:52 +0200 Subject: [PATCH 2/3] nix/os/devices/sj-srv1: bump versions --- nix/os/devices/sj-srv1/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 75efad0..7696638 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -39,11 +39,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1723816116, - "narHash": "sha256-EjAHH2CHixotYKJ39gC8kLuYKy2QUeOKgjLVD1xaROU=", + "lastModified": 1723817722, + "narHash": "sha256-m8o4Qpje/eeBfbWzikjkMMBYrzxRomDtPBSxJ6xGBcA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a800d4bb3ffebe4219b60bd5c81e53a323f72627", + "rev": "c49d0387e0b2ee9a53f5298eaaa6b2d37809962f", "type": "github" }, "original": { From 99f8c7a2f0dbe0bd3dea297c130c51e66ed6bffb Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 16 Aug 2024 16:47:21 +0200 Subject: [PATCH 3/3] debug(sj-srv1): rename container web -> websrv0 it's unclear why this is needed, however the IP address for the container wouldn't come up otherwise --- nix/os/devices/sj-srv1/system.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/os/devices/sj-srv1/system.nix b/nix/os/devices/sj-srv1/system.nix index dcb3658..b862faa 100644 --- a/nix/os/devices/sj-srv1/system.nix +++ b/nix/os/devices/sj-srv1/system.nix @@ -91,7 +91,7 @@ sievePort = 4190; }; - web = + websrv0 = import ../../containers/webserver.nix { specialArgs = {