fixed param order

Author: matiasdecarli

README.md

@@ -170,7 +170,7 @@ Settings in this part is immutable, you have to redeploy HAProxy service to make
 
 |Environment Variable|Default|Description|
 |:-----:|:-----:|:----------|
-|ADDITIONAL_BACKENDS| |list of additional backends to balance. The format is `backend name, server name ,FORCE_SSL(True|False),host:port,options`|
+|ADDITIONAL_BACKENDS| |list of additional backends to balance. The format is `backend name, FORCE_SSL(True|False), server name, host:port, options`|
 |ADDITIONAL_SERVICES| |list of additional services to balance (es: `prj1:web,prj2:sql`). Discovery will be based on `com.docker.compose.[project|service]` container labels. This environment variable only works on compose v2, and the referenced services must be on a network resolvable and accessible to this containers.|
 |BALANCE|roundrobin|load balancing algorithm to use. Possible values include: `roundrobin`, `static-rr`, `source`, `leastconn`. See:[HAProxy:balance](https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#4-balance)|
 |CA_CERT_FILE| |the path of a ca-cert file. This allows you to mount your ca-cert file directly from a volume instead of from envvar. If set, `CA_CERT` envvar will be ignored. Possible value: `/cacerts/cert0.pem`|

haproxy/config.py

@@ -28,21 +28,22 @@ def parse_extra_frontend_settings(envvars):
                     settings_dict[port] = settings
     return settings_dict
 
-# backend_name,server_name,settings,host:port
+# backend_name,FORCE_SSL,server_name,host:port, options
 def parse_additional_backends(additional_backend_settings):
    additional_backends = {}
    if not additional_backend_settings:
      return additional_backends
+
    for backend in additional_backend_settings.split(";"):
      parts = backend.split(",")
-     service_name, backend_name, redirect, backend_desc,options = parts
+     backend_name, force_ssl, server_name, host_port, options = parts
 
-     if redirect=="True":
-        route = ["redirect scheme https code 301 if !{ ssl_fc }", backend_name + ' ' + backend_desc + ' ' + options]
+     if force_ssl=="True":
+        route = ["redirect scheme https code 301 if !{ ssl_fc }", 'server ' + server_name + ' ' + host_port + ' ' + options]
      else:
-        route = [backend_name + ' ' + backend_desc + ' ' + options]
+        route = ['server ' + server_name + ' ' + host_port + ' ' + options]
 
-     additional_backends[service_name] = route
+     additional_backends[backend_name] = route
    return additional_backends
 
 # envvar