From 45e9357ad94ee051628c72f337fbb3cb8614b07b Mon Sep 17 00:00:00 2001 From: Ben Reedy Date: Sat, 4 Dec 2021 08:04:26 +1000 Subject: [PATCH] Remove explicit LISTEN_PORT from MSI installer Explicit setting of listening port in the service definition causes port setting in configuration file to be ignored. Exporter already defines a default port (9812) if one is not specified, so no impact from this change is anticipated. Signed-off-by: Ben Reedy --- installer/windows_exporter.wxs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/installer/windows_exporter.wxs b/installer/windows_exporter.wxs index ff8a8900..585d91eb 100644 --- a/installer/windows_exporter.wxs +++ b/installer/windows_exporter.wxs @@ -23,8 +23,10 @@ EXTRA_FLAGS - - LISTEN_ADDR OR LISTEN_PORT + + LISTEN_ADDR AND LISTEN_PORT + LISTEN_ADDR AND (NOT LISTEN_PORT) + LISTEN_PORT AND (NOT LISTEN_ADDR) METRICS_PATH @@ -50,7 +52,7 @@ [REMOTE_ADDR] - +