Updated versions.

6 files changed, 5 insertions, 21 deletions

diff --git a/dendrite/server/defaults/main.yaml b/dendrite/server/defaults/main.yaml
index 3498490..c9ec02c 100644
--- a/dendrite/server/defaults/main.yaml
+++ b/dendrite/server/defaults/main.yaml
@@ -1,7 +1,7 @@
 ---
 
 dendrite_user: "dendrite"
-dendrite_version: "0.5.0"
+dendrite_version: "0.5.1"
 dendrite_tar: "https://github.com/matrix-org/dendrite/archive/refs/tags/v{{dendrite_version}}.tar.gz"
 dendrite_build_dir: "/tmp/dendrite-{{dendrite_version}}"
 dendrite_old_key: false
diff --git a/ergo/defaults/main.yaml b/ergo/defaults/main.yaml
index fa1b16f..e36f895 100644
--- a/ergo/defaults/main.yaml
+++ b/ergo/defaults/main.yaml
@@ -1,7 +1,7 @@
 ---
 
 ergo_user: "ergo"
-ergo_version: "2.7.0"
+ergo_version: "2.8.0"
 ergo_arch: "arm64"
 ergo_tar_name: "ergo-{{ergo_version}}-linux-{{ergo_arch}}"
 ergo_tar: "{{ergo_tar_name}}.tar.gz"
diff --git a/minecraft/server/defaults/main.yaml b/minecraft/server/defaults/main.yaml
index 40718df..a050653 100644
--- a/minecraft/server/defaults/main.yaml
+++ b/minecraft/server/defaults/main.yaml
@@ -1,11 +1,5 @@
 ---
 
-minecraft_java_arch: "aarch64"
-minecraft_java_major: "17"
-minecraft_java_version: "{{minecraft_java_major}}.0.1"
-minecraft_java_build: "12"
-
-
 minecraft_user: "minecraft"
 minecraft_parent_dir: "/opt"
 minecraft_motd: "A Minecraft Server"
diff --git a/minecraft/server/tasks/main.yaml b/minecraft/server/tasks/main.yaml
index e9f0404..739ba65 100644
--- a/minecraft/server/tasks/main.yaml
+++ b/minecraft/server/tasks/main.yaml
@@ -4,16 +4,9 @@
   become: yes
   user: name="{{minecraft_user}}" home="{{minecraft_parent_dir}}/minecraft" shell="/bin/false" system="yes"
 
-- name: install adoptium java
+- name: install java
   become: yes
-  unarchive:
-    remote_src: yes
-    src: "{{minecraft_java_url}}"
-    dest: "/opt/"
-    creates: "/opt/jdk-{{minecraft_java_version}}+{{minecraft_java_build}}/"
-    owner: "root"
-    group: "root"
-  notify: restart minecraft
+  apt: name="openjdk-17-jre-headless"
 
 - name: create minecraft dir
   become: yes
diff --git a/minecraft/server/templates/[email protected] b/minecraft/server/templates/[email protected]
index c9534c4..df1defb 100644
--- a/minecraft/server/templates/[email protected]
+++ b/minecraft/server/templates/[email protected]
@@ -9,7 +9,7 @@ Group={{minecraft_user}}
 WorkingDirectory={{minecraft_parent_dir}}/minecraft/%i
 Restart=on-failure
 RestartSec=20 5
-ExecStart=/opt/jdk-{{minecraft_java_version}}+{{minecraft_java_build}}/bin/java -Xms{{minecraft_mem}} -Xmx{{minecraft_mem}} -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -jar server.jar nogui
+ExecStart=/usr/bin/java -Xms{{minecraft_mem}} -Xmx{{minecraft_mem}} -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -jar server.jar nogui
 
 PrivateTmp=true
 ProtectSystem=full
diff --git a/minecraft/server/vars/main.yaml b/minecraft/server/vars/main.yaml
index 85c1a1c..b592417 100644
--- a/minecraft/server/vars/main.yaml
+++ b/minecraft/server/vars/main.yaml
@@ -6,6 +6,3 @@ minecraft_url: "https://papermc.io/api/v2/projects/paper/versions/{{minecraft_pa
 # paper is a spigot derivative
 minecraft_dynmap_url: "http://dynmap.us/builds/dynmap/Dynmap-{{minecraft_dynmap_version}}-spigot.jar"
 minecraft_geyser_url: "https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/{{minecraft_geyser_vesrion}}/artifact/bootstrap/spigot/target/Geyser-Spigot.jar"
-
-# Java - https://adoptium.net/releases.html
-minecraft_java_url: "https://github.com/adoptium/temurin{{minecraft_java_major}}-binaries/releases/download/jdk-{{minecraft_java_version}}%2B{{minecraft_java_build}}/OpenJDK{{minecraft_java_major}}U-jdk_{{minecraft_java_arch}}_linux_hotspot_{{minecraft_java_version}}_{{minecraft_java_build}}.tar.gz"