Merge lp:~cjwatson/launchpad/no-default-http-proxy into lp:launchpad

Proposed by Colin Watson on 2018-06-26
Status: Merged
Merged at revision: 18704
Proposed branch: lp:~cjwatson/launchpad/no-default-http-proxy
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/lp/services/config/schema-lazr.conf (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/no-default-http-proxy
Reviewer Review Type Date Requested Status
Colin Watson Approve on 2018-06-26
Review via email: mp+348540@code.launchpad.net

Commit message

Don't set http_proxy by default.

Description of the change

It's now set in lp-production-configs for deployments on Canonical networks, and anyone else is unlikely to want squid.internal.

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

I'm going to self-approve this, as it's pretty trivial and it fixes a current test failure on buildbot.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/config/schema-lazr.conf'
2--- lib/lp/services/config/schema-lazr.conf 2018-06-06 12:46:56 +0000
3+++ lib/lp/services/config/schema-lazr.conf 2018-06-26 15:01:25 +0000
4@@ -915,7 +915,7 @@
5 # not the Launchpad section? At the moment, there are only scripts
6 # using this.
7 # datatype: string
8-http_proxy: http://squid.internal:3128/
9+http_proxy: none
10
11 # Session cookies being sent to a subdomain of the parent
12 # domains listed here will be sent to the parent domain,