mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-11 07:10:39 +02:00
fix: need attrset in config.lib, fix typo in nftables rule
This commit is contained in:
parent
41df399bb6
commit
21e88619b7
3 changed files with 3 additions and 3 deletions
|
@ -116,7 +116,7 @@ in {
|
||||||
};
|
};
|
||||||
virtualHosts.${auth.domain} = {
|
virtualHosts.${auth.domain} = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = config.lib.matchingWildcardCert auth.domain;
|
useACMEHost = config.lib.extra.matchingWildcardCert auth.domain;
|
||||||
locations."/".proxyPass = "https://kanidm";
|
locations."/".proxyPass = "https://kanidm";
|
||||||
# Allow using self-signed certs to satisfy kanidm's requirement
|
# Allow using self-signed certs to satisfy kanidm's requirement
|
||||||
# for TLS connections. (This is over wireguard anyway)
|
# for TLS connections. (This is over wireguard anyway)
|
||||||
|
|
|
@ -30,7 +30,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
lib = {
|
lib.extra = {
|
||||||
# For a given domain, this searches for a matching wildcard acme domain that
|
# For a given domain, this searches for a matching wildcard acme domain that
|
||||||
# would include the given domain. If no such domain is defined in
|
# would include the given domain. If no such domain is defined in
|
||||||
# extra.acme.wildcardDomains, an assertion is triggered.
|
# extra.acme.wildcardDomains, an assertion is triggered.
|
||||||
|
|
|
@ -198,7 +198,7 @@
|
||||||
then "${config.networking.hostName}.local"
|
then "${config.networking.hostName}.local"
|
||||||
else config.networking.fqdn;
|
else config.networking.fqdn;
|
||||||
inherit (cfg.networking.wireguard) port;
|
inherit (cfg.networking.wireguard) port;
|
||||||
openFirewallRules = ["untrusted"];
|
openFirewallRules = ["untrusted-to-local"];
|
||||||
};
|
};
|
||||||
linkName = "local-vms";
|
linkName = "local-vms";
|
||||||
ipv4 = net.cidr.host vmCfg.id cfg.networking.wireguard.cidrv4;
|
ipv4 = net.cidr.host vmCfg.id cfg.networking.wireguard.cidrv4;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue