Merge ~andreserl/maas:lp1786526_proxy_port_failsafe into maas:master

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 252037d2e2b11873709269bfba480cf531c2ca58
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1786526_proxy_port_failsafe
Merge into: maas:master
Diff against target: 16 lines (+4/-0)
1 file modified
src/provisioningserver/templates/proxy/maas-proxy.conf.template (+4/-0)
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
MAAS Lander unittests Pending
Review via email: mp+352906@code.launchpad.net

Commit message

LP: #1786526 - Add a failsafe mechanism to setting the proxy port

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good. Need a commit message.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/templates/proxy/maas-proxy.conf.template b/src/provisioningserver/templates/proxy/maas-proxy.conf.template
2index 2ff2080..cc23fa2 100644
3--- a/src/provisioningserver/templates/proxy/maas-proxy.conf.template
4+++ b/src/provisioningserver/templates/proxy/maas-proxy.conf.template
5@@ -23,7 +23,11 @@ http_access allow localnet
6 http_access allow localhost
7 http_access deny all
8 http_port 3128 transparent
9+{{if not maas_proxy_port}}
10+http_port 8000
11+{{else}}
12 http_port {{maas_proxy_port}}
13+{{endif}}
14 refresh_pattern ^ftp: 1440 20% 10080
15 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
16 refresh_pattern \/Release(|\.gpg)$ 0 0% 0 refresh-ims

Subscribers

People subscribed via source and target branches