From e126bb4803ce23eff6e0894e08e1ce6beab00413 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 6 Sep 2023 17:00:14 +0200
Subject: [PATCH] Update to 2023-09-06 17:00

---
 roles/unifi/defaults/main.yml          |  4 ++--
 roles/unifi/templates/unifi.service.j2 | 16 +++++++++++++++-
 roles/unifi/vars/RedHat-8.yml          |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml
index 511b6a5..c2625c9 100644
--- a/roles/unifi/defaults/main.yml
+++ b/roles/unifi/defaults/main.yml
@@ -3,11 +3,11 @@
 # Where unifi will be installed
 unifi_root_dir: /opt/unifi
 # Version to deploy
-unifi_version: 7.4.162
+unifi_version: 7.5.174
 # URL to get the installation tarball
 unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip
 # Expected sha256
-unifi_archive_sha256: 5cd0f62b10d069b75817b37be4780e83d90fc2d37eaa6dbd6db842d637ac3d28
+unifi_archive_sha256: c27d5a69c8df06f36a995a383930dec75a34fd4af1b2eb2c7d5318bee75bfc90
 # Should ansible handle upgrades (if False, only initial install will be done)
 unifi_manage_upgrade: True
 # List of ports used by UniFi controler
diff --git a/roles/unifi/templates/unifi.service.j2 b/roles/unifi/templates/unifi.service.j2
index 0b24eeb..d2070b4 100644
--- a/roles/unifi/templates/unifi.service.j2
+++ b/roles/unifi/templates/unifi.service.j2
@@ -6,7 +6,21 @@ After=syslog.target network.target
 Type=simple
 User=unifi
 WorkingDirectory={{ unifi_root_dir }}/app
-ExecStart=/usr/bin/java -Djava.awt.headless=true -Xmx{{ unifi_mem_limit }}M -Xms{{ (unifi_mem_limit * 0.5) | int }}M -Djava.net.preferIPv4Stack=true {% if system_proxy is defined and system_proxy != '' %}-Dhttp.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttp.proxyPort={{ system_proxy | urlsplit('port') }} -Dhttps.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttps.proxyPort={{ system_proxy | urlsplit('port') }} {% endif %}-jar {{ unifi_root_dir }}/app/lib/ace.jar start
+ExecStart=/usr/lib/jvm/jre-17/bin/java \
+            --add-opens=java.base/java.io=ALL-UNNAMED \
+            --add-opens=java.base/java.lang=ALL-UNNAMED \
+            --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
+            --add-opens=java.base/java.time=ALL-UNNAMED \
+            -Djava.awt.headless=true \
+            -Xmx{{ unifi_mem_limit }}M -Xms{{ (unifi_mem_limit * 0.5) | int }}M \
+            -Djava.net.preferIPv4Stack=true \
+{% if system_proxy is defined and system_proxy != '' %}
+            -Dhttp.proxyHost={{ system_proxy | urlsplit('hostname') }} \
+            -Dhttp.proxyPort={{ system_proxy | urlsplit('port') }} \
+            -Dhttps.proxyHost={{ system_proxy | urlsplit('hostname') }} \
+            -Dhttps.proxyPort={{ system_proxy | urlsplit('port') }} \
+{% endif %}
+            -jar {{ unifi_root_dir }}/app/lib/ace.jar start
 ExecStop=/usr/bin/java -jar {{ unifi_root_dir }}/app/lib/ace.jar stop
 SuccessExitStatus=143
 PrivateTmp=yes
diff --git a/roles/unifi/vars/RedHat-8.yml b/roles/unifi/vars/RedHat-8.yml
index b162f26..19f8c26 100644
--- a/roles/unifi/vars/RedHat-8.yml
+++ b/roles/unifi/vars/RedHat-8.yml
@@ -1,6 +1,6 @@
 ---
 
 unifi_packages:
-  - java-11-openjdk-headless
+  - java-17-openjdk-headless
   - mongodb-org-server
   - mongodb-org