From 2ce72065a7d156175806db49a7e8ece39eaec750 Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 13 Aug 2025 13:47:11 -0700 Subject: [PATCH] Handle env correctly Former-commit-id: b462b2c53bb9aed3937bba66fad4c1b71a1e522c --- main.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 257e9bc..67ea1dd 100644 --- a/main.go +++ b/main.go @@ -197,7 +197,11 @@ func runOlmMainWithArgs(ctx context.Context, args []string) { httpAddr = os.Getenv("HTTP_ADDR") pingIntervalStr := os.Getenv("PING_INTERVAL") pingTimeoutStr := os.Getenv("PING_TIMEOUT") - doHolepunch = os.Getenv("HOLEPUNCH") == "true" // Default to true, can be overridden by flag + enableHTTPEnv := os.Getenv("ENABLE_HTTP") + holepunchEnv := os.Getenv("HOLEPUNCH") + + enableHTTP = enableHTTPEnv == "true" + doHolepunch = holepunchEnv == "true" if endpoint == "" { serviceFlags.StringVar(&endpoint, "endpoint", "", "Endpoint of your Pangolin server") @@ -229,8 +233,12 @@ func runOlmMainWithArgs(ctx context.Context, args []string) { if pingTimeoutStr == "" { serviceFlags.StringVar(&pingTimeoutStr, "ping-timeout", "5s", " Timeout for each ping (default 3s)") } - serviceFlags.BoolVar(&enableHTTP, "enable-http", false, "Enable HTT server for receiving connection requests") - serviceFlags.BoolVar(&doHolepunch, "holepunch", false, "Enable hole punching (default false)") + if enableHTTPEnv == "" { + serviceFlags.BoolVar(&enableHTTP, "enable-http", false, "Enable HTT server for receiving connection requests") + } + if holepunchEnv == "" { + serviceFlags.BoolVar(&doHolepunch, "holepunch", false, "Enable hole punching (default false)") + } version := serviceFlags.Bool("version", false, "Print the version")