update
This commit is contained in:
@@ -5,6 +5,7 @@ mod fail2ban;
|
||||
mod firewall;
|
||||
mod logs;
|
||||
mod network;
|
||||
mod privileged;
|
||||
mod services;
|
||||
mod system;
|
||||
mod wireguard;
|
||||
@@ -17,7 +18,14 @@ use tracing_subscriber::EnvFilter;
|
||||
|
||||
#[tokio::main(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn main() -> Result<()> {
|
||||
let config_path = parse_args()?;
|
||||
let arguments = parse_args()?;
|
||||
if arguments.privileged_helper {
|
||||
return privileged::serve_once(&arguments.config_path);
|
||||
}
|
||||
if let Some(transaction) = arguments.firewall_rollback {
|
||||
return privileged::rollback_firewall(&arguments.config_path, &transaction);
|
||||
}
|
||||
let config_path = arguments.config_path;
|
||||
let config = Config::load(&config_path)?;
|
||||
tracing_subscriber::fmt()
|
||||
.with_env_filter(
|
||||
@@ -54,9 +62,17 @@ async fn main() -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn parse_args() -> Result<PathBuf> {
|
||||
struct Arguments {
|
||||
config_path: PathBuf,
|
||||
privileged_helper: bool,
|
||||
firewall_rollback: Option<String>,
|
||||
}
|
||||
|
||||
fn parse_args() -> Result<Arguments> {
|
||||
let mut args = env::args().skip(1);
|
||||
let mut config = PathBuf::from("/etc/vps-agent/config.toml");
|
||||
let mut privileged_helper = false;
|
||||
let mut firewall_rollback = None;
|
||||
while let Some(argument) = args.next() {
|
||||
match argument.as_str() {
|
||||
"--config" => {
|
||||
@@ -65,6 +81,10 @@ fn parse_args() -> Result<PathBuf> {
|
||||
.map(PathBuf::from)
|
||||
.context("--config needs a path")?
|
||||
}
|
||||
"--privileged-helper" => privileged_helper = true,
|
||||
"--firewall-rollback" => {
|
||||
firewall_rollback = Some(args.next().context("--firewall-rollback needs an id")?)
|
||||
}
|
||||
"--version" | "-V" => {
|
||||
println!("vps-agent {}", env!("CARGO_PKG_VERSION"));
|
||||
std::process::exit(0);
|
||||
@@ -76,7 +96,11 @@ fn parse_args() -> Result<PathBuf> {
|
||||
_ => anyhow::bail!("unknown argument: {argument}"),
|
||||
}
|
||||
}
|
||||
Ok(config)
|
||||
Ok(Arguments {
|
||||
config_path: config,
|
||||
privileged_helper,
|
||||
firewall_rollback,
|
||||
})
|
||||
}
|
||||
|
||||
async fn wait_for_shutdown() {
|
||||
|
||||
Reference in New Issue
Block a user