Skip to content
Snippets Groups Projects
Commit b456718f authored by Anders Harrisson's avatar Anders Harrisson
Browse files

Set Java property "defaultProtocol" to "pva"

JIRA INFRA-10406
parent 600c74c9
No related branches found
No related tags found
1 merge request!6Update Jmasar to 5.0.011
Pipeline #197632 passed
...@@ -17,3 +17,4 @@ server_servlet_contextPath: / ...@@ -17,3 +17,4 @@ server_servlet_contextPath: /
jmasar_java_properties: {} jmasar_java_properties: {}
jmasar_epics_pva_addr_list: "localhost" jmasar_epics_pva_addr_list: "localhost"
jmasar_epics_pva_auto_addr_list: "NO" jmasar_epics_pva_auto_addr_list: "NO"
jmasar_epics_default_protocol: pva
...@@ -10,7 +10,7 @@ Environment=EPICS_PVA_AUTO_ADDR_LIST={{ jmasar_epics_pva_auto_addr_list }} ...@@ -10,7 +10,7 @@ Environment=EPICS_PVA_AUTO_ADDR_LIST={{ jmasar_epics_pva_auto_addr_list }}
Environment='EPICS_CA_ADDR_LIST={{ jmasar_epics_ca_addr_list }}' Environment='EPICS_CA_ADDR_LIST={{ jmasar_epics_ca_addr_list }}'
Environment=EPICS_CA_AUTO_ADDR_LIST={{ jmasar_epics_ca_auto_addr_list }} Environment=EPICS_CA_AUTO_ADDR_LIST={{ jmasar_epics_ca_auto_addr_list }}
{% if jmasar_graylog_host %} {% if jmasar_graylog_host %}
ExecStart={{ java_openjdk_bin }} -DGRAYLOG_HOST={{ jmasar_graylog_host }} -DGRAYLOG_PORT={{ jmasar_graylog_port }} -Djavax.net.ssl.trustStore={{ javax_net_ssl_trustStore }} -Dserver.servlet.contextPath={{ server_servlet_contextPath }} {% for x in (jmasar_java_properties | dict2items) %}"-D{{ x.key }}={{ x.value }}" {% endfor %}-jar jmasar-service.jar ExecStart={{ java_openjdk_bin }} -DdefaultProtocol={{ jmasar_epics_default_protocol }} -DGRAYLOG_HOST={{ jmasar_graylog_host }} -DGRAYLOG_PORT={{ jmasar_graylog_port }} -Djavax.net.ssl.trustStore={{ javax_net_ssl_trustStore }} -Dserver.servlet.contextPath={{ server_servlet_contextPath }} {% for x in (jmasar_java_properties | dict2items) %}"-D{{ x.key }}={{ x.value }}" {% endfor %}-jar jmasar-service.jar
{% else %} {% else %}
ExecStart={{ java_openjdk_bin }} -jar jmasar-service.jar ExecStart={{ java_openjdk_bin }} -jar jmasar-service.jar
{% endif %} {% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment