roberth/simple-nixos-fediverse
2
1
Fork 0
forked from Fediversity/simple-nixos-fediverse
Code Pull requests Activity

domainForBucket

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-09-24 14:23:29 +02:00
parent 6b45256839
commit 050042d255
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fediversity/default.nix
View file

@ -68,9 +68,13 @@ in {
type = types.int; type = types.int;
default = 3902; default = 3902;
}; };
domainForBucket = mkOption {
type = types.functionTo types.str;
default = bucket: "${bucket}.${config.fediversity.internal.garage.web.rootDomain}";
};
urlForBucket = mkOption { urlForBucket = mkOption {
type = types.functionTo types.str; type = types.functionTo types.str;
default = bucket: "http://${bucket}.${config.fediversity.internal.garage.web.rootDomain}"; default = bucket: "http://${config.fediversity.internal.garage.web.domainForBucket bucket}";
}; };
}; };
}; };

2
fediversity/garage.nix
View file

@ -177,7 +177,7 @@ in
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
serverName = fedicfg.web.rootDomain; serverName = fedicfg.web.rootDomain;
serverAliases = lib.mapAttrsToList (bucket: _: "${bucket}.${fedicfg.web.rootDomain}") cfg.ensureBuckets; ## TODO: use wildcard certificates? serverAliases = lib.mapAttrsToList (bucket: _: fedicfg.web.domainForBucket bucket) cfg.ensureBuckets; ## TODO: use wildcard certificates?
locations."/" = { locations."/" = {
proxyPass = "http://localhost:3902"; proxyPass = "http://localhost:3902";
extraConfig = '' extraConfig = ''