Merge pull request #400 from techtino/master

Update setenv.sh.epp if statement to work with service desk
voxpupuli · Apr 27, 2022 · 2cceea2 · 2cceea2
2 parents 6fb7fb9 + d0041b0
commit 2cceea2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/setenv.sh.epp b/templates/setenv.sh.epp
@@ -38,7 +38,7 @@ JVM_CODE_CACHE_ARGS='<%= pick_default($jira::jvm_code_cache_args, $jira::config:
 #
 # The following are the required arguments for Jira.
 #
-<%- if versioncmp($jira::version, '8.11.0') > 0 { -%>
+<%- if ($jira::product != "servicedesk" and versioncmp($jira::version, '8.11.0') > 0) or ($jira::product == "servicedesk" and (versioncmp($jira::version, '4.11.0') > 0)){ -%>
 JVM_REQUIRED_ARGS='-Djava.awt.headless=true -Datlassian.standalone=JIRA -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dmail.mime.decodeparameters=true -Dorg.dom4j.factory=com.atlassian.core.xml.InterningDocumentFactory'
 <% } else { -%>
 JVM_REQUIRED_ARGS='-Djava.awt.headless=true -Datlassian.standalone=JIRA -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dmail.mime.decodeparameters=true'