mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2025-12-22 17:27:14 +01:00
grzegorz: use values.nix
This commit is contained in:
committed by
h7x4
parent
1d08131076
commit
6d171ef0d2
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, unstablePkgs, ... }:
|
{config, lib, pkgs, unstablePkgs, values, ...}:
|
||||||
let
|
let
|
||||||
grg = config.services.greg-ng;
|
grg = config.services.greg-ng;
|
||||||
grgw = config.services.grzegorz-webui;
|
grgw = config.services.grzegorz-webui;
|
||||||
@@ -44,8 +44,8 @@ in {
|
|||||||
"${machine}.pvv.org"
|
"${machine}.pvv.org"
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 129.241.210.128/25;
|
allow ${values.ipv4-space}
|
||||||
allow 2001:700:300:1900::/64;
|
allow ${values.ipv6-space}
|
||||||
deny all;
|
deny all;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@@ -67,8 +67,8 @@ in {
|
|||||||
"${machine}-backend.pvv.org"
|
"${machine}-backend.pvv.org"
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 129.241.210.128/25;
|
allow ${values.ipv4-space}
|
||||||
allow 2001:700:300:1900::/64;
|
allow ${values.ipv6-space}
|
||||||
deny all;
|
deny all;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@@ -86,8 +86,8 @@ in {
|
|||||||
"${machine}-old.pvv.org"
|
"${machine}-old.pvv.org"
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 129.241.210.128/25;
|
allow ${values.ipv4-space}
|
||||||
allow 2001:700:300:1900::/64;
|
allow ${values.ipv6-space}
|
||||||
deny all;
|
deny all;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user