allow multiple haproxy servers with options

haproxy/siteconfig.nix

@@ -3,8 +3,7 @@
 , lib
 }:
 { serviceName
-, serviceAddress ? null
+, servers ? []
-, serviceSocket ? null
 , phpFastcgi ? false
 , phpDocroot ? null
 , phpIndex ? "index.php"
@@ -13,46 +12,55 @@
 , extraBackendOptions ? []
 }:
 
-assert lib.assertMsg (
+with lib;
-  (serviceAddress == null && serviceSocket != null)
+with lib.lists;
-  || (serviceAddress != null && serviceSocket == null)
+with lib.attrsets;
-) "set either serviceAddress or serviceSocket";
-
 let
-  backendOptions = lib.concatMapStrings (x : "\n  " + x) extraBackendOptions;
+  indent = map (x: "  " + x);
 
-  serviceBind = if serviceAddress != null then serviceAddress else serviceSocket;
+  mkServer = i: s:
+    let
+      proto = optional phpFastcgi "proto fcgi";
+    in
+    concatStringsSep " " ([
+      "server ${serviceName}${toString i} ${s.address}"
+    ] ++ proto ++ s.extra);
+
+  serverslines = imap1 mkServer servers;
 
   backend =
-    if !phpFastcgi
+    (
-    then ''
+      concatStringsSep "\n" (
-    backend ${serviceName}
+        [
-      mode http
+          "backend ${serviceName}"
-      option forwardfor${backendOptions}
+        ]
-      server ${serviceName}1 ${serviceBind}
+        ++ indent [
-    '' else ''
+          "mode http"
-    backend ${serviceName}
+          "option forwardfor"
-      mode http
+        ]
-      option forwardfor${backendOptions}
+        ++ indent extraBackendOptions
-      use-fcgi-app ${serviceName}-php-fpm
+        ++ optional phpFastcgi "  use-fcgi-app ${serviceName}-php-fpm"
-      server ${serviceName}1 ${serviceBind} proto fcgi
+        ++ indent serverslines
+        ++ [""]) # final newline
+    ) +
+    (if !phpFastcgi then "" else ''
 
     fcgi-app ${serviceName}-php-fpm
       log-stderr global
       docroot ${phpDocroot}
       index ${phpIndex}
       path-info ^(/.+\.php)(/.*)?$
-    '';
+    '');
 
-  extraAclsCondition = lib.concatStrings (lib.attrsets.mapAttrsToList (k: v: "\nacl acl_${serviceName}_${k} ${v}") extraUseBackendConditions);
+  extraAclsCondition = concatStrings (mapAttrsToList (k: v: "\nacl acl_${serviceName}_${k} ${v}") extraUseBackendConditions);
 
-  extraAclsOr = lib.concatStrings (lib.attrsets.mapAttrsToList (k: v: " OR acl_${serviceName}_${k}") extraUseBackendConditions); 
+  extraAclsOr = concatStrings (mapAttrsToList (k: v: " OR acl_${serviceName}_${k}") extraUseBackendConditions);
 in
 {
   frontend = ''
   acl acl_${serviceName} hdr_beg(host) ${serviceName}.${extraAclsCondition}
   ''
-  + lib.concatMapStrings (x: x + "\n") extraFrontendOptions
+  + concatMapStrings (x: x + "\n") extraFrontendOptions
   + ''
   use_backend ${serviceName} if acl_${serviceName}${extraAclsOr}
   '';