Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Add a note to generated systemd proxy files #278
Conversation
rogpeppe
approved these changes
May 2, 2017
LGTM with a suggestion for a slightly different phrasing.
| @@ -92,7 +92,10 @@ func (s *Settings) AsEnvironmentValues() []string { | ||
| // DefaultEnvironment="http_proxy=...." "HTTP_PROXY=..." ... | ||
| func (s *Settings) AsSystemdDefaultEnv() string { | ||
| lines := s.AsEnvironmentValues() | ||
| - rv := `[Manager] | ||
| + rv := `# To make juju control global systemd proxy settings create |
rogpeppe
May 2, 2017
Owner
I'm finding this a bit hard to parse.
Perhaps:
# To allow juju to control the global systemd proxy settings,
# create symbolic links to this file from within /etc/systemd/system.conf.d/
# and /etc/systemd/users.conf.d/.
?
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-utils |
|
Build failed: Tests failed |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju-utils |
jujubot
merged commit b16611e
into
juju:master
May 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
wupeka commentedMay 1, 2017
Add a comment in juju proxy systemd config file on how to enable systemd to use it.