← Back to branch summary

~rharding/charms/precise/juju-gui/update-nagios

« back to all changes in this revision

Viewing changes to config/haproxy.cfg.template

  • Committer: Rick Harding
  • Date: 2014-01-15 14:50:46 UTC
  • mfrom: (147.1.8 remove-pyjuju)
  • Revision ID: rick.harding@canonical.com-20140115145046-lyh9879k9x8hwb8i
Remove support for PyJuju and rapi from charm.

- Removes the support for running rapi/pyjuju.
- Removes the agent used to communicate with zookeeper.
- Removes anything pertaining to zookeeper.
- Attempts to clean up docs and such to make sense with pure juju-core.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/haproxy.cfg.template
22
22
backend juju
23
23
    # The Juju WebSocket backend.
24
24
    # Re-encrypt outgoing connections.
25
 
    {{if legacy_juju}}
26
 
        server ws1 {{api_address}} ssl ca-file {{api_pem}} verify required check-ssl inter 500ms
27
 
    {{else}}
28
 
        # Replace "/ws/" with "/" in any request path.
29
 
        reqrep ^([^\ ]*)\ /ws/    \1\ /
30
 
        server ws1 {{api_address}} ssl check-ssl inter 500ms
31
 
    {{endif}}
 
25
    # Replace "/ws/" with "/" in any request path.
 
26
    reqrep ^([^\ ]*)\ /ws/    \1\ /
 
27
    server ws1 {{api_address}} ssl check-ssl inter 500ms
32
28
 
33
29
backend web
34
30
    # Web traffic.