From d2bf5bef2492d6238f71693a28ae6ad456c46020 Mon Sep 17 00:00:00 2001
From: Anders Harrisson <anders.harrisson@ess.eu>
Date: Mon, 4 Mar 2024 15:07:05 +0000
Subject: [PATCH] Fix issue with incorrect separator on -Dhttp.nonProxyHosts
---
templates/phoebus.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/phoebus.j2 b/templates/phoebus.j2
index a40cf6e..44209cf 100644
--- a/templates/phoebus.j2
+++ b/templates/phoebus.j2
@@ -15,4 +15,4 @@ export ESS_OPIS="{{ phoebus_git_folders_base }}/ess-opis"
export ESS_SYMBOLS="{{ phoebus_ess_symbols_path }}"
export JAVA_ARGS="-XX:+DisableAttachMechanism -Djavax.net.ssl.trustStore={{ phoebus_javax_net_ssl_trustStore }} -Djava.net.useSystemProxies={{ phoebus_use_system_proxies | string | lower }} $JAVA_ARGS"
-{{ java_openjdk_bin }} $JAVA_ARGS $JAVA_OPTS{{ " -Dhttp.proxyHost=" + phoebus_http_proxy_host if phoebus_http_proxy_host else "" }}{{ " -Dhttp.proxyPort=" + (phoebus_http_proxy_port | string) if phoebus_http_proxy_port else "" }}{{ " -Dhttp.nonProxyHosts=" + (phoebus_http_non_proxy_hosts | join(',')) if phoebus_http_non_proxy_hosts else "" }}{{ " -Dhttps.proxyHost=" + phoebus_https_proxy_host if phoebus_https_proxy_host else "" }}{{ " -Dhttps.proxyPort=" + (phoebus_https_proxy_port | string) if phoebus_https_proxy_port else "" }} -Dlogback.configurationFile={{ phoebus_logback_config }} -jar $PHOEBUS_JAR $PHOEBUS_OPTS -settings "{{ phoebus_settings_path }}" $@
+{{ java_openjdk_bin }} $JAVA_ARGS $JAVA_OPTS{{ " -Dhttp.proxyHost=" + phoebus_http_proxy_host if phoebus_http_proxy_host else "" }}{{ " -Dhttp.proxyPort=" + (phoebus_http_proxy_port | string) if phoebus_http_proxy_port else "" }}{{ " -Dhttp.nonProxyHosts=" + (phoebus_http_non_proxy_hosts | join('|')) if phoebus_http_non_proxy_hosts else "" }}{{ " -Dhttps.proxyHost=" + phoebus_https_proxy_host if phoebus_https_proxy_host else "" }}{{ " -Dhttps.proxyPort=" + (phoebus_https_proxy_port | string) if phoebus_https_proxy_port else "" }} -Dlogback.configurationFile={{ phoebus_logback_config }} -jar $PHOEBUS_JAR $PHOEBUS_OPTS -settings "{{ phoebus_settings_path }}" $@
--
GitLab