← Back to branch summary

~simpoir/landscape-charm/charm_push_target

« back to all changes in this revision

Viewing changes to lib/relations/haproxy.py

  • Committer: 🤖 Landscape Builder
  • Author(s): Danilo Šegan
  • Date: 2017-02-24 12:58:11 UTC
  • mfrom: (379.1.1 reenable-haproxy-httpchk)
  • Revision ID: _landscape_builder-20170224125811-rhujo87gbayeu6g6
Merge reenable-haproxy-httpchk [f=] [r=adam-collard,ack,landscape-builder] [a=Данило Шеган]
Re-instate haproxy HEAD HTTP check

Now that pppa proxy supports unauthenticated HTTP HEAD checks, we can reinstate the check for all the services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/relations/haproxy.py
37
37
        "timeout client 300000",
38
38
        "timeout server 300000",
39
39
        "balance leastconn",
40
 
        # XXX 2016-10-25 Danilo - commented out until we can figure out a way
41
 
        # for pppa-proxy to respond to this successfully.
42
 
        # "option httpchk HEAD / HTTP/1.0",
 
40
        "option httpchk HEAD / HTTP/1.0",
43
41
        "http-request set-header X-Forwarded-Proto https",
44
42
        "acl message path_beg -i /message-system",
45
43
        "acl attachment path_beg -i /attachment",