Merge lp://staging/~ltrager/maas/peer_proxy into lp://staging/~maas-committers/maas/trunk
Proposed by
Lee Trager
| Status: | Rejected |
|---|---|
| Rejected by: | MAAS Lander |
| Proposed branch: | lp://staging/~ltrager/maas/peer_proxy |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
139 lines (+61/-1) 4 files modified
src/maasserver/models/config.py (+2/-1) src/maasserver/proxyconfig.py (+18/-0) src/maasserver/tests/test_proxyconfig.py (+33/-0) src/provisioningserver/templates/proxy/maas-proxy.conf.template (+8/-0) |
| To merge this branch: | bzr merge lp://staging/~ltrager/maas/peer_proxy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Needs Information | ||
|
Review via email:
|
|||
Commit message
Allow user Squid proxy config to be defined in /etc/maas/
To post a comment you must log in.
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Unmerged revisions
- 6042. By Lee Trager
-
Allow user Squid proxy config to be defined in /etc/maas/
proxy/{ *.acl, *.conf} or /var/snap/ maas/common/ proxy/{ *.acl, *.conf}
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This is a nice improvement but doesn't really solve what the real issue is. That said, this could be additional so let's discuss it.