~bloodearnest/content-cache-charm:no-cache-check

Branch merges

Propose for merging

Merged into content-cache-charm:master at revision a8202185259bd98902c3e31b10f450efd906dae5

Joel Sing (community): Approve (+1) on 2019-10-08

Canonical IS Reviewers: Pending requested 2019-10-08

Diff: 318 lines (+44/-38)

4 files modified

lib/haproxy.py (+9/-3)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+17/-17)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+9/-9)
tests/unit/files/haproxy_config_rendered_test_output.txt (+9/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

86788e0... by Simon Davy on 2019-10-08

Add no-cache headers to the haproxy healthchecks

f38f20e... by Haw Loeung on 2019-10-08

Add support for IPv6 - LP: #1845896

HAProxy docs states:

- empty ("") => family will be AF_INET and address will be INADDR_ANY
- "*" => family will be AF_INET and address will be INADDR_ANY
- "::" => family will be AF_INET6 and address will be IN6ADDR_ANY

So we need a separate 'bind' for IPv6.

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/373442
Reviewed-by: Joel Sing <email address hidden>

73cf53e... by Haw Loeung on 2019-10-08

Fixed based on feedback - InvalidAddressPortError raised includes value

2067d9b... by Haw Loeung on 2019-10-08

Merge upstream changes and fix conflicts.

7f95fb2... by Haw Loeung on 2019-10-08

Fixed based on reviews.

Fixed to raise InvalidAddressPortError exception on invalid address or
port.

Also, for IPv6 addresses, enforce form to require square brackets.

2286971... by Ryan Finnie on 2019-10-03

Fix nginx cache config for multiple sites with the same site-name

Reviewed-on: https://code.launchpad.net/~fo0bar/content-cache-charm/+git/content-cache-charm/+merge/373613
Reviewed-by: Haw Loeung <email address hidden>

c67b2fe... by Ryan Finnie on 2019-10-03

Fix nginx cache config for multiple sites with the same site-name

949ca87... by Ryan Finnie on 2019-10-03

Fix haproxy.cfg formatting error when using multiple sites with tls-cert-bundle-path

Reviewed-on: https://code.launchpad.net/~fo0bar/content-cache-charm/+git/content-cache-charm/+merge/373605
Reviewed-by: Haw Loeung <email address hidden>

c35af09... by Ryan Finnie on 2019-10-03

Fix haproxy.cfg formatting error when using multiple sites with tls-cert-bundle-path

f126199... by Haw Loeung on 2019-10-01

Add utils.ip_addr_port_split() and use that to better handle IPv6 addresses