Drift/pvv-nixos-config
17
4
Fork 1
Code Issues Pull Requests9 Actions Wiki Activity

Compare commits

...

3 Commits
setup-git- ... grg-ip

Author SHA1 Message Date
Peder Bergebakken Sundt
dc5fdb97c7 values/grzegorz: migrate ntnu IPs to values.nix 2025-05-31 20:53:11 +02:00
Peder Bergebakken Sundt
d3d705baeb grzegorz: allow all of ntnu 2025-03-18 21:23:51 +01:00
Peder Bergebakken Sundt
6e78a28bec grzegorz: use values.nix 2025-03-18 21:23:51 +01:00
2 changed files with 26 additions and 9 deletions

26
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,12 @@ in {
"${machine}.pvv.org"
];
extraConfig = ''
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';
};
@ -51,8 +55,12 @@ in {
"${machine}-backend.pvv.org"
];
extraConfig = ''
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';
@ -70,8 +78,12 @@ in {
"${machine}-old.pvv.org"
];
extraConfig = ''
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';

9
values.nix

@ -1,8 +1,13 @@
# Feel free to change the structure of this file
let
pvv-ipv4 = suffix: "129.241.210.${toString suffix}";
pvv-ipv6 = suffix: "2001:700:300:1900::${toString suffix}";
ntnu-ipv4 = suffix: "129.241.${toString suffix}";
ntnu-ipv6 = suffix: "2001:700:300:${toString suffix}";
pvv-ipv4 = suffix: ntnu-ipv4 "210.${toString suffix}";
pvv-ipv6 = suffix: ntnu-ipv6 "1900::${toString suffix}";
in rec {
ntnu.ipv4-space = ntnu-ipv4 "0.0/16"; # https://ipinfo.io/ips/129.241.0.0/16
ntnu.ipv6-space = ntnu-ipv6 ":/48"; # https://ipinfo.io/2001:700:300::
ipv4-space = pvv-ipv4 "128/25";
ipv6-space = pvv-ipv6 "/64";