~hloeung/content-cache-charm:local-site-content

Branch merges

Propose for merging

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

Joel Sing (community): Approve (+1) on 2019-04-16

Diff: 199 lines (+86/-10)

8 files modified

templates/nginx_cfg.tmpl (+5/-4)
tests/unit/files/config_test_config.txt (+18/-4)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+18/-0)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+6/-0)
tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output.txt (+1/-0)
tests/unit/files/haproxy_config_rendered_test_output.txt (+7/-0)
tests/unit/files/nginx_config_rendered_test_output-site2.local.txt (+0/-2)
tests/unit/files/nginx_config_rendered_test_output-site4.local.txt (+31/-0)

api

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

Joel Sing (community): Approve (+1) on 2019-04-15

Canonical IS Reviewers: Pending requested 2019-04-15

Diff: 183 lines (+65/-25)

7 files modified

config.yaml (+3/-0)
lib/nginx.py (+13/-11)
reactive/content_cache.py (+10/-6)
templates/nginx_cfg.tmpl (+9/-0)
tests/unit/files/config_test_config.txt (+5/-0)
tests/unit/files/nginx_config_rendered_test_output-site2.local.txt (+11/-0)
tests/unit/test_nginx.py (+14/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

c5fcf00... by Haw Loeung on 2019-04-15

Allow multiple locations and custom configs for each location

fa71401... by Haw Loeung on 2019-04-15

Add ability to serve local site content

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

44b2d8d... by Haw Loeung on 2019-04-15

Fixed based on review

d99530a... by Haw Loeung on 2019-04-15

Sort

07b7a79... by Haw Loeung on 2019-04-15

Try make it clear full path to local content we're serving

745a579... by Haw Loeung on 2019-04-15

root is not really local path as it's still /$root/$location. Also fixed fixed Nginx off-by-slash vulnerability.

2820c63... by Haw Loeung on 2019-04-15

Add ability to serve local site content

30cb4af... by Haw Loeung on 2019-04-13

Set timezone for unit tests for freezegun

freezegun's tz_offset still uses the local timezone on host and then calculates the offset based on that. We need to export TZ=UTC instead.

| [hloeung@dharkan tmp]$ python3
| Python 3.6.7 (default, Oct 22 2018, 11:32:17)
| [GCC 8.2.0] on linux
| Type "help", "copyright", "credits" or "license" for more information.
| >>> import datetime
| >>> import freezegun
| >>> @freezegun.freeze_time("2019-03-22", tz_offset=0)
| ... def time_offset():
| ... return datetime.datetime.now().timestamp()
| ...
| >>> print(time_offset())
| 1553173200.0
| >>>

| [hloeung@dharkan tmp]$ export TZ=UTC
| [hloeung@dharkan tmp]$ python3
| Python 3.6.7 (default, Oct 22 2018, 11:32:17)
| [GCC 8.2.0] on linux
| Type "help", "copyright", "credits" or "license" for more information.
| >>> import datetime
| >>> import freezegun
| >>> @freezegun.freeze_time("2019-03-22", tz_offset=0)
| ... def time_offset():
| ... return datetime.datetime.now().timestamp()
| ...
| >>> print(time_offset())
| 1553212800.0
| >>>

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

17b6f26... by Haw Loeung on 2019-04-13

Set timezone for unit tests for freezegun

f9ea693... by Nick Moffitt on 2019-04-04

Apply workaround for https://github.com/cmars/nrpe-external-master-interface/issues/12

Reviewed-on: https://code.launchpad.net/~nick-moffitt/content-cache-charm/+git/content-cache-charm/+merge/365527
Reviewed-by: Stuart Bishop <email address hidden>