SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 19:51:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add custom libs subdomainOf and rootDomainOf

Browse source
This commit is contained in:
SebastianStork 2025-10-12 23:15:32 +02:00
parent f3ea2b75e6
commit 8807d38b57
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/system/services/caddy.nix
View file

@ -20,9 +20,6 @@ let
443
];
subdomainOf = domain: domain |> lib.splitString "." |> lib.head;
rootDomainOf = domain: domain |> lib.splitString "." |> lib.tail |> lib.concatStringsSep ".";
mkWildCardDomain =
rootDomain: values:
lib.nameValuePair "*.${rootDomain}" {
@ -33,8 +30,8 @@ let
{ domain, port, ... }:
''
import subdomain-log ${domain}
@${subdomainOf domain} host ${domain}
handle @${subdomainOf domain} {
@${lib.custom.subdomainOf domain} host ${domain}
handle @${lib.custom.subdomainOf domain} {
reverse_proxy localhost:${toString port}
}
'';
@ -47,7 +44,7 @@ let
lib.nameValuePair domain {
logFormat = "output file ${config.services.caddy.logDir}/${domain}.log { mode 640 }";
extraConfig = ''
bind tailscale/${subdomainOf domain}
bind tailscale/${lib.custom.subdomainOf domain}
reverse_proxy localhost:${toString port}
'';
};
@ -150,7 +147,7 @@ in
'';
virtualHosts =
nonTailscaleHosts
|> lib.groupBy (value: rootDomainOf value.domain)
|> lib.groupBy (value: lib.custom.rootDomainOf value.domain)
|> lib.mapAttrs' mkWildCardDomain;
};
})

4
modules/system/web-services/gatus.nix
View file

@ -101,8 +101,6 @@ in
custom.services.gatus.endpoints =
let
getSubdomain = domain: domain |> lib.splitString "." |> lib.head;
defaultEndpoints =
self.nixosConfigurations
|> lib.mapAttrs (_: value: value.config.meta.domains.list)
@ -112,7 +110,7 @@ in
|> lib.filter (domain: domain != cfg.domain)
|> lib.map (
domain:
lib.nameValuePair (getSubdomain domain) {
lib.nameValuePair (lib.custom.subdomainOf domain) {
inherit domain;
group = hostName;
}