added the ability to select the Java version (#722)

Author: djooberlee

atlassian-servicedesk/init.sls

@@ -32,11 +32,17 @@ nginx_files_1:
             client_max_body_size 1000m;
   {%- if pillar["atlassian-servicedesk"]["nginx_forwards"] is defined %}
     {%- for domain in pillar["atlassian-servicedesk"]["nginx_forwards"] %}
+      {%- set ns = namespace(cert_domain=domain) %}
+      {%- for acme_config in pillar["atlassian-servicedesk"]["acme_configs"] %}
+        {%- if domain in acme_config["domains"] %}
+          {%- set ns.cert_domain = acme_config["domains"][0] %}
+        {%- endif %}
+      {%- endfor %}
             server {
                 listen 443 ssl;
                 server_name {{ domain }};
-                ssl_certificate /opt/acme/cert/atlassian-servicedesk_{{ domain }}_fullchain.cer;
-                ssl_certificate_key /opt/acme/cert/atlassian-servicedesk_{{ domain }}_key.key;
+                ssl_certificate /opt/acme/cert/atlassian-servicedesk_{{ ns.cert_domain }}_fullchain.cer;
+                ssl_certificate_key /opt/acme/cert/atlassian-servicedesk_{{ ns.cert_domain }}_key.key;
                 return 301 https://{{ pillar["atlassian-servicedesk"]["http_proxyName"] }}$request_uri;
             }
     {%- endfor %}
@@ -96,7 +102,7 @@ servicedesk-dependencies:
     - pkgs:
       - libxslt1.1
       - xsltproc
-      - openjdk-17-jdk
+      - openjdk-{{ pillar["atlassian-servicedesk"].get("java_version", 17) }}-jdk
 
 servicedesk:
   file.managed:
@@ -331,3 +337,4 @@ servicedesk-enable-SSOSeraphAuthenticator:
     - watch_in:
       - service: servicedesk
 {% endif %}
+

atlassian-servicedesk/pillar.example

@@ -3,7 +3,8 @@ atlassian-servicedesk:
     source: 'salt://atlassian/addon/atlassian-addon-v1.2.3/atlassian-addon.addon'
     target: '/opt/atlassian/atlassian-addon.addon'
     javaopts: '-javaagent:/opt/atlassian/atlassian-addon.addon'
-  version: 5.1.0
+  version: 11.2.1
+  java_version: 21
   acme_configs:
     - name: example_com
       domains: