mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-05-07 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Support environment variable parsing in config files (#1640)

Browse Source
This commit is contained in:
Mg Pig
2025-12-02 17:54:31 +08:00
committed by GitHub
parent ae6d929f4a
commit 53f279f5ff
10 changed files with 898 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/core.rs
+9 -2
View File
@@ -133,6 +133,9 @@ struct Cli {
#[clap(long, help = t!("core_clap.daemon").to_string())]
daemon: bool,
#[clap(long, help = t!("core_clap.disable_env_parsing").to_string())]
disable_env_parsing: bool,
}
#[derive(Parser, Debug, Default, PartialEq, Eq)]
@@ -1209,8 +1212,12 @@ async fn run_main(cli: Cli) -> anyhow::Result<()> {
}
};
for config_file in config_files {
let (mut cfg, mut control) =
load_config_from_file(&config_file, cli.config_dir.as_ref()).await?;
let (mut cfg, mut control) = load_config_from_file(
&config_file,
cli.config_dir.as_ref(),
cli.disable_env_parsing,
)
.await?;
if cli.network_options.can_merge(&cfg, config_file_count) {
cli.network_options