diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2 index 2688b4b..450055b 100644 --- a/templates/haproxy.cfg.j2 +++ b/templates/haproxy.cfg.j2 @@ -106,7 +106,8 @@ frontend docker_ft mode http acl swarm_api hdr_dom(host) -i {{ docker_swarm_expose_api_hostname }} - acl swarm_api_allowed_nets src {% for net in docker_swarm_api_networks_acl %} {{ net }}{% endfor %} + +# acl swarm_api_allowed_nets src {% for net in docker_swarm_api_networks_acl %} {{ net }}{% endfor %} # http-request deny if swarm_api !swarm_api_allowed_nets # http-request deny unless METH_GET || { env(POST) -m bool } @@ -156,7 +157,7 @@ backend portainer_bck http-check send meth HEAD uri / ver HTTP/1.1 hdr Host localhost http-check expect rstatus (2|3)[0-9][0-9] balance roundrobin - server-template portainer- 1 portainer:{{ docker_swarm_portainer_http_port }} check resolvers docker init-addr libc,none + server-template portainer- 1 portainer_portainer:{{ docker_swarm_portainer_http_port }} check resolvers docker init-addr libc,none {% endif %} {% for srv in docker_swarm_haproxy_additional_services %} @@ -174,5 +175,5 @@ backend {{ srv.acl_name }}_bck stick-table {{ srv.stick_table }} {% endif %} {% endif %} - server-template {{ srv.service_name }}- {{ srv.service_replica_num }} {{ srv.service_name }}:{{ srv.service_port }} {{ srv.backend_options | default('') }} check resolvers docker init-addr libc,none + server-template {{ srv.service_name }}- {{ srv.service_replica_num }} {{ srv.service_name }}_{{ srv.service_name }}:{{ srv.service_port }} {{ srv.backend_options | default('') }} check resolvers docker init-addr libc,none {% endfor %}