From a78f7aaaaa7dcc7dc25f4ceb1653f08fc962fe6d Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Sun, 12 Dec 2021 18:48:50 -0600
Subject: Updated minecraft

---
 minecraft/server/tasks/adoptopenjdk.yaml | 21 ---------------------
 minecraft/server/tasks/main.yaml         | 12 ++++++++++--
 2 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 minecraft/server/tasks/adoptopenjdk.yaml

(limited to 'minecraft/server/tasks')

diff --git a/minecraft/server/tasks/adoptopenjdk.yaml b/minecraft/server/tasks/adoptopenjdk.yaml
deleted file mode 100644
index 077114e..0000000
--- a/minecraft/server/tasks/adoptopenjdk.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-- name: configure apt proxy bypass for https
-  become: yes
-  copy: src="03adoptopenjdk-direct" dest="/etc/apt/apt.conf.d/03adoptopenjdk-direct"
-
-- name: add adoptopenjdk apt key
-  become: yes
-  apt_key: url="https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public/"
-
-- name: add adoptopenjdk apt repo
-  become: yes
-  apt_repository: repo="deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main"
-
-- name: update apt package cache
-  become: yes
-  apt: upgrade="dist" autoremove="yes" autoclean="yes" update_cache="yes" cache_valid_time="3600"
-
-- name: install adoptopenjdk hotspot jre 16
-  become: yes
-  apt: name="adoptopenjdk-16-hotspot-jre"
diff --git a/minecraft/server/tasks/main.yaml b/minecraft/server/tasks/main.yaml
index 8a7178a..e9f0404 100644
--- a/minecraft/server/tasks/main.yaml
+++ b/minecraft/server/tasks/main.yaml
@@ -4,8 +4,16 @@
   become: yes
   user: name="{{minecraft_user}}" home="{{minecraft_parent_dir}}/minecraft" shell="/bin/false" system="yes"
 
-- name: install adoptopenjdk
-  include_tasks: adoptopenjdk.yaml
+- name: install adoptium 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
 
 - name: create minecraft dir
   become: yes
-- 
cgit v1.2.3