felixalb/pvv-nixos-config
1
0
Fork 0
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git synced 2025-12-22 17:27:14 +01:00
Code Issues Projects Releases Wiki Activity

values/grzegorz: migrate ntnu IPs to values.nix

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-05-31 20:53:11 +02:00
committed by h7x4
parent f1bdd71192
commit 3a9efb2b1f
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/grzegorz.nix
View File

@@ -48,8 +48,8 @@ in {
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::
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';
@@ -75,8 +75,8 @@ in {
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::
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';
@@ -98,8 +98,8 @@ in {
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::
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
deny all;
'';

9
values.nix
View File

@@ -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";