From 6e78a28becec305d554ccc9e2147932503fb92d8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 18 Mar 2025 20:47:29 +0100
Subject: [PATCH 1/2] grzegorz: use values.nix
---
modules/grzegorz.nix | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/grzegorz.nix b/modules/grzegorz.nix
index 9a9752d..3b10aee 100644
--- a/modules/grzegorz.nix
+++ b/modules/grzegorz.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{config, lib, pkgs, values, ...}:
let
grg = config.services.greg-ng;
grgw = config.services.grzegorz-webui;
@@ -37,8 +37,8 @@ in {
"${machine}.pvv.org"
];
extraConfig = ''
- allow 129.241.210.128/25;
- allow 2001:700:300:1900::/64;
+ allow ${values.ipv4-space}
+ allow ${values.ipv6-space}
deny all;
'';
};
@@ -51,8 +51,8 @@ in {
"${machine}-backend.pvv.org"
];
extraConfig = ''
- allow 129.241.210.128/25;
- allow 2001:700:300:1900::/64;
+ allow ${values.ipv4-space}
+ allow ${values.ipv6-space}
deny all;
'';
@@ -70,8 +70,8 @@ in {
"${machine}-old.pvv.org"
];
extraConfig = ''
- allow 129.241.210.128/25;
- allow 2001:700:300:1900::/64;
+ allow ${values.ipv4-space}
+ allow ${values.ipv6-space}
deny all;
'';
--
2.49.0
From d3d705baebbb0cc552bc464fd08eedb9dca8a668 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 18 Mar 2025 20:58:15 +0100
Subject: [PATCH 2/2] grzegorz: allow all of ntnu
---
modules/grzegorz.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/modules/grzegorz.nix b/modules/grzegorz.nix
index 3b10aee..d72399a 100644
--- a/modules/grzegorz.nix
+++ b/modules/grzegorz.nix
@@ -37,8 +37,12 @@ in {
"${machine}.pvv.org"
];
extraConfig = ''
+ # pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
+ # ntnu
+ allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+ allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
deny all;
'';
};
@@ -51,8 +55,12 @@ in {
"${machine}-backend.pvv.org"
];
extraConfig = ''
+ # pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
+ # ntnu
+ allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+ allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
deny all;
'';
@@ -70,8 +78,12 @@ in {
"${machine}-old.pvv.org"
];
extraConfig = ''
+ # pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
+ # ntnu
+ allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+ allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
deny all;
'';
--
2.49.0