Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

cli/common: introduce a common config file #45

Merged
merged 1 commit into from
May 12, 2017

Conversation

lucab
Copy link
Contributor

@lucab lucab commented May 10, 2017

This introduces a torcx-config-v0 JSON input to specify common
torcx configuration. This is mostly useful for torcx-generator, as
it can't be passed custom command-line or environmental flags.

The config file is located by default under /etc/torcx/config.json
but can be moved somewhere else by specifying torcx_config= as a
kernel boot option.

@lucab lucab requested a review from squeed May 10, 2017 13:51
@lucab
Copy link
Contributor Author

lucab commented May 10, 2017

For reference, this is coming from #37 (comment).

@squeed
Copy link
Collaborator

squeed commented May 12, 2017

LGTM, sweet.

This introduces a `torcx-config-v0` JSON input to specify common
torcx configuration. This is mostly useful for torcx-generator, as
it can't be passed custom command-line or environmental flags.

The config file is located by default under `/etc/torcx/config.json`
but can be moved somewhere else by specifying `torcx_config=` as a
kernel boot option.
@lucab
Copy link
Contributor Author

lucab commented May 12, 2017

Single line change to resolve a simple move conflict, I'm keeping previous LGTM.

@lucab lucab merged commit 6190f82 into coreos:master May 12, 2017
@lucab lucab deleted the ups/config-from-file branch May 12, 2017 12:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants