/utils

Add function to export proxy settings as systemd config #271

Merged
merged 5 commits into from Apr 13, 2017

Conversation

Reviewers

@jameinel jameinel

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@wupeka @jujubot @jameinel
@wupeka
Member

wupeka commented Apr 12, 2017

ProxySettings.AsSystemdDefaultEnv exports proxy settings in a form understandable by systemd.
@jameinel

jameinel approved these changes Apr 13, 2017
View changes

some comments, mostly about clearly documenting AutoNoProxy

proxy/proxy.go
+ Https string
+ Ftp string
+ NoProxy string
+ AutoNoProxy string
@jameinel

jameinel Apr 13, 2017

Owner

We should probably clearly document AutoNoProxy as it isn't something people who know about proxy stuff are going to immediately understand.

At least an update to the Settings doc.

proxy/proxy.go
+ allNoProxy = append(allNoProxy, strings.Split(s.AutoNoProxy, ",")...)
+ }
+ noProxySet := set.NewStrings(allNoProxy...)
+ return strings.Join(noProxySet.SortedValues(), ",")
@jameinel

jameinel Apr 13, 2017

Owner

Ordering doesn't matter, right?

@wupeka

wupeka Apr 13, 2017

Member

It doesn't, it's a set.

@wupeka
Member

wupeka commented Apr 13, 2017

!!test!!
@wupeka
Member

wupeka commented Apr 13, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Apr 13, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-utils
@jujubot
Contributor

jujubot commented Apr 13, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-utils/175
@wupeka
Member

wupeka commented Apr 13, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Apr 13, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-utils

@jujubot jujubot merged commit 10e5006 into juju:master Apr 13, 2017

rogpeppe added a commit to rogpeppe/juju-utils that referenced this pull request Apr 21, 2017

@rogpeppe
proxy: do not add extra newline 
PR #271 changed AsScriptEnvironment so that
it adds a trailing newline to the script lines.

Some juju tests failed as a result of this change, so revert
to the previous behaviour - the final newline isn't
needed.
a7e3bf3

@rogpeppe rogpeppe referenced this pull request Apr 21, 2017

Merged

proxy: do not add extra newline #275

jujubot added a commit that referenced this pull request Apr 21, 2017

@jujubot
Merge pull request #275 from rogpeppe/033-proxy-no-extra-newline 
proxy: do not add extra newline

PR #271 changed AsScriptEnvironment so that
it adds a trailing newline to the script lines.

Some juju tests failed as a result of this change, so revert
to the previous behaviour - the final newline isn't
needed.
51660d0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment