Fix firewall support

roles/float-base-net-overlay/templates/firewall/11net-overlay.j2

@@ -19,7 +19,8 @@ add_rule -A vpn-{{ tinc_net }}-input -p tcp --dport {{ ep.port }} -j ACCEPT
 {% endfor %}
 {% for ep in services[s].get('public_tcp_endpoints', {}) %}
 {% for port in ep.get('ports', []) %}
-add_rule -A vpn-{{ tinc_net }}-input -p tcp --dport {{ port }} -j ACCEPT
+{% set public = port.public | default(port) %}
+add_rule -A vpn-{{ tinc_net }}-input -p tcp --dport {{ public }} -j ACCEPT
 {% endfor %}
 {% if 'port' in ep %}
 add_rule -A vpn-{{ tinc_net }}-input -p tcp --dport {{ ep.port }} -j ACCEPT

roles/float-infra-haproxy/templates/firewall/20haproxy.j2

@@ -2,7 +2,8 @@
 {% for ep in service.get('public_tcp_endpoints', []) %}
 {% if ep.get('ports', []) %}
 {% for port in ep.ports %}
-allow_port tcp {{ port }}
+{% set public = port.public | default(port) %}
+allow_port tcp {{ public }}
 {% endfor %}
 {% else %}
 allow_port tcp {{ ep.public_port | default(ep.port) }}