Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{fs::read_to_string, path::PathBuf};
use std::{fs::read_to_string, net::IpAddr, path::PathBuf};

use clap::Parser;
use log::LevelFilter;
Expand Down Expand Up @@ -53,6 +53,12 @@ pub struct Config {
#[arg(long = "config", short)]
#[serde(skip)]
config_path: Option<PathBuf>,

#[arg(long, env = "DEFGUARD_HTTP_BIND_ADDRESS")]
pub http_bind_address: Option<IpAddr>,

#[arg(long, env = "DEFGUARD_GRPC_BIND_ADDRESS")]
pub grpc_bind_address: Option<IpAddr>,
}

#[derive(thiserror::Error, Debug)]
Expand Down
14 changes: 12 additions & 2 deletions src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,12 @@ pub async fn run_server(config: Config) -> anyhow::Result<()> {
// Start gRPC server.
debug!("Spawning gRPC server");
tasks.spawn(async move {
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), config.grpc_port);
let addr = SocketAddr::new(
config
.grpc_bind_address
.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
config.grpc_port,
);
info!("gRPC server is listening on {addr}");
let mut builder = if let (Some(cert), Some(key)) = (grpc_cert, grpc_key) {
let identity = Identity::from_pem(cert, key);
Expand Down Expand Up @@ -244,7 +249,12 @@ pub async fn run_server(config: Config) -> anyhow::Result<()> {
// Start web server.
debug!("Spawning API web server");
tasks.spawn(async move {
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), config.http_port);
let addr = SocketAddr::new(
config
.http_bind_address
.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)),
config.http_port,
);
let listener = TcpListener::bind(&addr).await?;
info!("API web server is listening on {addr}");
serve(
Expand Down
Loading