architect: add allowWAN option, correctly blocking WAN traffic
This commit is contained in:
parent
03939c0061
commit
0da9f7ab9d
@ -113,6 +113,12 @@ in
|
|||||||
default = "";
|
default = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
allowWAN = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "If set to false, deny all WAN traffic.";
|
||||||
|
};
|
||||||
|
|
||||||
deny = mkOption {
|
deny = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
@ -140,9 +146,9 @@ in
|
|||||||
proxyPass = "http://${location.host}:${toString location.port}${location.path}";
|
proxyPass = "http://${location.host}:${toString location.port}${location.path}";
|
||||||
proxyWebsockets = location.proxyWebsockets;
|
proxyWebsockets = location.proxyWebsockets;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
${optionalString location.allowLan "deny 10.0.0.1;"}
|
|
||||||
${concatMapStringsSep "\n" (denyCIDR: "deny ${denyCIDR};") location.deny}
|
|
||||||
${concatMapStringsSep "\n" (allowCIDR: "allow ${allowCIDR};") location.allow}
|
${concatMapStringsSep "\n" (allowCIDR: "allow ${allowCIDR};") location.allow}
|
||||||
|
${optionalString (!location.allowWAN) "deny all;"}
|
||||||
|
${concatMapStringsSep "\n" (denyCIDR: "deny ${denyCIDR};") location.deny}
|
||||||
${optionalString location.allowLan ''allow ${config.architect.networks."lan".net};''}
|
${optionalString location.allowLan ''allow ${config.architect.networks."lan".net};''}
|
||||||
'' + location.extraConfig;
|
'' + location.extraConfig;
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user