lp://qastaging/~danilo/landscape-charm/reenable-haproxy-httpchk
- Get this branch:
- bzr branch lp://qastaging/~danilo/landscape-charm/reenable-haproxy-httpchk
Branch merges
- Adam Collard (community): Approve
- Alberto Donato (community): Approve
- 🤖 Landscape Builder: Approve (test results)
-
Diff: 43 lines (+4/-4)2 files modifiedlib/relations/haproxy.py (+1/-3)
lib/relations/tests/test_haproxy.py (+3/-1)
Branch information
Recent revisions
- 379. By Alberto Donato
-
Merge amulet-
actions- support [f=] [r=landscape- builder, simpoir, free.ekanayaka] [a=Alberto Donato]
Use standard amulet methods for creating and fetching actions, rather than our own code. - 378. By Alberto Donato
-
Merge integration-
tests-juju2 [f=] [r=adam- collard, landscape- builder, free.ekanayaka] [a=Alberto Donato]
Update charm tests to support running them with juju2.This uses bundletester instead of juju-test (which doesn't work with juju2).
- 377. By Alberto Donato
-
Use the new bundles branch location (separate project). [trivial] [r=Ursinha]
- 376. By Alberto Donato
-
Merge deploy-
targets- local-charm [f=] [r=danilo, simpoir, landscape- builder] [a=Alberto Donato]
Change deploy-* targets to always deploy from the local branch (since they're meant for testing deployments from a local branch with a standalone package). - 375. By Данило Шеган
-
Merge archive-url [f=1638580] [r=chad.
smith,free. ekanayaka, landscape- builder] [a=Данило Шеган]
Set archive-url in [pppa-proxy] section of service.conf when hosted relation is there. Based on value of root-url if there, otherwise uses special value "RELATIVE". - 373. By Данило Шеган
-
Merge pppa-proxy-
haproxy- rules [f=1625373] [r=tribaal, landscape- builder, free.ekanayaka] [a=Данило Шеган]
Introduce haproxy rules to expose pppa-proxy with charmed LandscapeSince "option httpchk" is applied globally, and pppa-proxy requires authentication even on "HEAD /" HTTP request, that has been commented out for the time being.
If root-url is set on the landscape-server charm, we expose the service using "archive.
<root-hostname> " domain name, and if it's not defined, we expose it using a relative path "/archive". We are not doing anything special for SSL certificates to cover both domains, which might be needed, but could be solved with either wildcard or altSubjectName certs as well.
- 372. By Alberto Donato
-
Merge enable-
package- search [f=1636809] [r=bjornt, danilo, landscape- builder] [a=Alberto Donato]
Enable package search by default.
This sets the account-threshold to zero, so that package search is used in all cases. - 371. By Данило Шеган
-
Merge gpg-options [f=1625327] [r=tribaal,
ack,landscape- builder] [a=Данило Шеган]
Make gpg-home-path and gpg-passphrase-path required in "hosted" relation data and use them to write out entries in service.conf.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/~landscape/landscape-charm/trunk