Skip to content

Commit

Permalink
Merge pull request #38 from hellofresh/feature/fix_haproxy_formatting
Browse files Browse the repository at this point in the history
Fixed extra space before frontend  config in haproxy template
  • Loading branch information
aleeriz authored Oct 13, 2017
2 parents 4d7bb5c + 7acda29 commit 0531c80
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/haproxy.ctmp.j2
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ backend {{ service_name }}-{{ env_name }}
server <%.ID%>_<%.Address%>:<%.Port%> <%.Address%>:<%.Port%> {% if consul_haproxy_default_balance == 'roundrobin' %}weight <% scratch.Get "weightValue" %> {% endif %} {{ haproxy_setting.server_options | default(consul_haproxy_default_server_options) }}
{% if tag_regex %}<%else%> # Did not match tag_regex {{ tag_regex }}<%end%>{% endif %}
{% if tags_contains %}<%else%> # Did not match tags_contains {{ tags_contains }}<%end%>{% endif %}
<%end%>
<% end -%>
<%- end %>
<%- end %>

frontend {{ service_name }}-{{ env_name }}
mode {{ haproxy_setting.service_mode | default('http') }}
Expand Down

0 comments on commit 0531c80

Please sign in to comment.