diff --git a/ops/nixos/bvm-twitterchiver/default.nix b/ops/nixos/bvm-twitterchiver/default.nix index f7062bbce2..87cedb0cba 100644 --- a/ops/nixos/bvm-twitterchiver/default.nix +++ b/ops/nixos/bvm-twitterchiver/default.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -{ depot, ... }: +{ depot, pkgs, ... }: let inherit (depot.ops) secrets; in { @@ -23,6 +23,7 @@ in { services.postgresql = { enable = true; + package = pkgs.postgresql_14; ensureDatabases = [ "twitterchiver" ]; diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix index ec5e37e128..dac7c428b9 100644 --- a/ops/nixos/swann/default.nix +++ b/ops/nixos/swann/default.nix @@ -604,7 +604,7 @@ in { subnet6 2a09:a443:1::/48 { range6 2a09:a443:1:1::/64; range6 2a09:a443:1:2::/64 temporary; - prefix6 2a09:a443:1:1000:: 2a09:a443:1:ffff:: /56; + prefix6 2a09:a443:1:1000:: 2a09:a443:1:ff00:: /56; option dhcp6.name-servers 2a09:a443:1::1; option dhcp6.domain-search "house.as205479.net"; @@ -612,7 +612,7 @@ in { subnet6 2a09:a443:3::/48 { range6 2a09:a443:3:1::/64; range6 2a09:a443:3:2::/64 temporary; - prefix6 2a09:a443:3:1000:: 2a09:a443:3:ffff:: /56; + prefix6 2a09:a443:3:1000:: 2a09:a443:3:ff00:: /56; option dhcp6.name-servers 2a09:a443:3::1; option dhcp6.domain-search "eduroam.as205479.net";