Merge branch 'main' of gitlab.hackers.town:veilid/veilid into dev
This commit is contained in:
@@ -750,6 +750,16 @@ impl Settings {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Determine default config path
|
||||
///
|
||||
/// In a unix-like environment, veilid-server will look for its config file
|
||||
/// in /etc/veilid-server. If a config is not found in this location, it will
|
||||
/// follow the XDG user directory spec, and look in `~/.config/veilid-server/`.
|
||||
///
|
||||
/// For Windows, a user-local config may be created at
|
||||
/// `C:\Users\<user>\AppData\Roaming\Veilid\Veilid`, and for macOS, at
|
||||
/// `/Users/<user>/Library/Application Support/org.Veilid.Veilid`
|
||||
///
|
||||
pub fn get_default_config_path() -> PathBuf {
|
||||
#[cfg(unix)]
|
||||
{
|
||||
|
@@ -26,6 +26,7 @@ async fn handle_signals(mut signals: Signals) {
|
||||
}
|
||||
}
|
||||
|
||||
#[warn(missing_docs)]
|
||||
#[instrument(err)]
|
||||
pub fn run_daemon(settings: Settings, _matches: ArgMatches) -> EyreResult<()> {
|
||||
let daemon = {
|
||||
|
Reference in New Issue
Block a user