Landscape Charm

Merge lp:~ahasenack/landscape-charm/no-https-redirect-for-repository into lp:~landscape/landscape-charm/trunk

  1. no-https-redirect-for-repository
  2. Merge into trunk
Proposed by Andreas Hasenack
Status: Merged
Approved by: Chad Smith
Approved revision: 354
Merged at revision: 362
Proposed branch: lp:~ahasenack/landscape-charm/no-https-redirect-for-repository
Merge into: lp:~landscape/landscape-charm/trunk
Diff against target: 27 lines (+4/-2)
2 files modified
lib/relations/haproxy.py (+2/-1)
lib/relations/tests/test_haproxy.py (+2/-1)
To merge this branch: bzr merge lp:~ahasenack/landscape-charm/no-https-redirect-for-repository
Reviewer Review Type Date Requested Status
Chad Smith Approve
Francis Ginther (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+303405@code.launchpad.net

Commit message

Don't forcibly redirect requests for the landscape managed repository to https, as that may break clients who will (correctly) check the server SSL certificate. The repository itself is always signed via a GPG key.

Description of the change

Don't forcibly redirect requests for the landscape managed repository to https, as that may break clients who will (correctly) check the server SSL certificate. The repository itself is always signed via a GPG key.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 354
Branch: lp:~ahasenack/landscape-charm/no-https-redirect-for-repository
Jenkins: https://ci.lscape.net/job/latch-test/7886/

review: Approve (test results)
Revision history for this message
Francis Ginther (fginther) wrote :

This looks good.

review: Approve
Revision history for this message
Chad Smith (chad.smith) wrote :

+1, valid syntax for the multiple conditions.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/relations/haproxy.py'
2--- lib/relations/haproxy.py 2015-11-05 14:52:40 +0000
3+++ lib/relations/haproxy.py 2016-08-19 12:35:42 +0000
4@@ -25,7 +25,8 @@
5 "balance leastconn",
6 "option httpchk HEAD / HTTP/1.0",
7 "acl ping path_beg -i /ping",
8- "redirect scheme https unless ping",
9+ "acl repository path_beg -i /repository",
10+ "redirect scheme https unless ping OR repository",
11 "use_backend landscape-ping if ping",
12 ],
13 "https": [
14
15=== modified file 'lib/relations/tests/test_haproxy.py'
16--- lib/relations/tests/test_haproxy.py 2015-11-09 11:24:36 +0000
17+++ lib/relations/tests/test_haproxy.py 2016-08-19 12:35:42 +0000
18@@ -75,7 +75,8 @@
19 "balance leastconn",
20 "option httpchk HEAD / HTTP/1.0",
21 "acl ping path_beg -i /ping",
22- "redirect scheme https unless ping",
23+ "acl repository path_beg -i /repository",
24+ "redirect scheme https unless ping OR repository",
25 "use_backend landscape-ping if ping"],
26 "errorfiles": expected_errorfiles,
27 "servers": [

Subscribers

People subscribed via source and target branches