cli: propagate server-data-dir and extensions-dir when installing service (#236734)

Fixes #236195
This commit is contained in:
Connor Peet
2024-12-20 10:29:40 -08:00
committed by GitHub
parent 720422ca07
commit eee5e7643a
2 changed files with 38 additions and 21 deletions

View File

@@ -103,7 +103,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
serve_web::serve_web(context!(), sw_args).await
}
Some(args::Commands::Tunnel(tunnel_args)) => match tunnel_args.subcommand {
Some(args::Commands::Tunnel(mut tunnel_args)) => match tunnel_args.subcommand.take() {
Some(args::TunnelSubcommand::Prune) => tunnels::prune(context!()).await,
Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context!()).await,
Some(args::TunnelSubcommand::Kill) => tunnels::kill(context!()).await,
@@ -116,7 +116,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
tunnels::user(context!(), user_command).await
}
Some(args::TunnelSubcommand::Service(service_args)) => {
tunnels::service(context_no_logger(), service_args).await
tunnels::service(context_no_logger(), tunnel_args, service_args).await
}
Some(args::TunnelSubcommand::ForwardInternal(forward_args)) => {
tunnels::forward(context_no_logger(), forward_args).await