mirror of https://gitlab.crans.org/nounous/nixos
Merge branch 'reverseproxy-fix' into 'main'
Fixing the reverse proxy alias configuration See merge request nounous/nixos!51merge-requests/51/merge
commit
6526c30909
|
|
@ -168,22 +168,36 @@ in
|
||||||
];
|
];
|
||||||
}) cfg.virtualHosts;
|
}) cfg.virtualHosts;
|
||||||
|
|
||||||
# Configuration des alias .fr et .eu
|
# Génération des alias
|
||||||
aliasConfig = lib.fold (
|
getAliases = name: config: lib.foldr (
|
||||||
tld: acc:
|
tld: acc:
|
||||||
acc
|
acc
|
||||||
// lib.mapAttrs' (
|
++
|
||||||
vhostName: vhostConfig:
|
(lib.foldr (alias: acc: acc ++ ["${alias}.crans.${tld}"]) ["${name}.crans.${tld}"] config.serverAliases)
|
||||||
lib.nameValuePair "${vhostName}-alias-${tld}" rec {
|
)
|
||||||
rejectSSL = vhostConfig.httpOnly;
|
(lib.foldr (alias: acc: acc ++ ["${alias}.crans.${mainTld}"]) [] config.serverAliases)
|
||||||
forceSSL = !rejectSSL;
|
otherTld;
|
||||||
enableACME = !rejectSSL;
|
|
||||||
serverName = "${vhostName}.crans.${tld}";
|
# Configuration des alias
|
||||||
serverAliases = map (name: "${name}.crans.${tld}") vhostConfig.serverAliases;
|
aliasConfig = lib.foldr (
|
||||||
globalRedirect = "${vhostName}.crans.${mainTld}";
|
vhost: acc:
|
||||||
|
acc
|
||||||
|
//
|
||||||
|
lib.foldr (
|
||||||
|
alias: acc:
|
||||||
|
acc
|
||||||
|
//
|
||||||
|
{
|
||||||
|
"${vhost.name}-alias-${alias}" = rec {
|
||||||
|
rejectSSL = vhost.value.httpOnly;
|
||||||
|
forceSSL = !rejectSSL;
|
||||||
|
enableACME = !rejectSSL;
|
||||||
|
serverName = alias;
|
||||||
|
globalRedirect = "${vhost.name}.crans.${mainTld}";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
) cfg.virtualHosts
|
) { } (getAliases vhost.name vhost.value)
|
||||||
) { } otherTld;
|
) { } (lib.attrsToList cfg.virtualHosts);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue