Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an alternative path for user.toml #3814

Merged
merged 5 commits into from
Nov 6, 2017
Merged

Add an alternative path for user.toml #3814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b89232
Refactor Cfg::new to not use Cfg::default()
krnowak Nov 3, 2017
a20498a
Add an alternative path for user.toml
krnowak Oct 13, 2017
5ff6caf
Make service config code easier to test
krnowak Oct 30, 2017
bb7446a
Add tests for loading user configuration
krnowak Nov 3, 2017
50f3aad
Simplify the serialize_config test
krnowak Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions components/sup/src/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ lazy_static! {
pub static ref SVC_ROOT: PathBuf = {
Path::new(&*FS_ROOT_PATH).join("hab/svc")
};

pub static ref USER_ROOT: PathBuf = {
Path::new(&*FS_ROOT_PATH).join("hab/user")
};
}

/// Returns the root path for a given service's configuration, files, and data.
Expand Down Expand Up @@ -66,3 +70,15 @@ pub fn svc_logs_path<T: AsRef<Path>>(service_name: T) -> PathBuf {
pub fn svc_pid_file<T: AsRef<Path>>(service_name: T) -> PathBuf {
svc_path(service_name).join("PID")
}

/// Returns the root path for a given service's user configuration,
/// files, and data.
pub fn user_path<T: AsRef<Path>>(service_name: T) -> PathBuf {
USER_ROOT.join(service_name)
}

/// Returns the path to a given service's user configuration
/// directory.
pub fn user_config_path<T: AsRef<Path>>(service_name: T) -> PathBuf {
user_path(service_name).join("config")
}
Loading