Merge branch 'reverseproxy-fix' into 'main'

Fixing the reverse proxy alias configuration

See merge request nounous/nixos!51

modules/services/reverseproxy.nix

@@ -168,22 +168,36 @@ in
             ];
           }) cfg.virtualHosts;
 
-          # Configuration des alias .fr et .eu
-          aliasConfig = lib.fold (
+          # Génération des alias
+          getAliases = name: config: lib.foldr (
             tld: acc:
             acc
-            // lib.mapAttrs' (
-              vhostName: vhostConfig:
-              lib.nameValuePair "${vhostName}-alias-${tld}" rec {
-                rejectSSL = vhostConfig.httpOnly;
-                forceSSL = !rejectSSL;
-                enableACME = !rejectSSL;
-                serverName = "${vhostName}.crans.${tld}";
-                serverAliases = map (name: "${name}.crans.${tld}") vhostConfig.serverAliases;
-                globalRedirect = "${vhostName}.crans.${mainTld}";
+            ++
+            (lib.foldr (alias: acc: acc ++ ["${alias}.crans.${tld}"]) ["${name}.crans.${tld}"] config.serverAliases)
+          )
+          (lib.foldr (alias: acc: acc ++ ["${alias}.crans.${mainTld}"]) [] config.serverAliases)
+          otherTld;
+
+          # Configuration des alias
+          aliasConfig = lib.foldr (
+            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
-          ) { } otherTld;
+            ) { } (getAliases vhost.name vhost.value)
+          ) { } (lib.attrsToList cfg.virtualHosts);
         in
         {
           enable = true;