diff options
| -rw-r--r-- | minecraft/defaults/main.yaml | 9 | ||||
| -rw-r--r-- | minecraft/files/03adoptopenjdk-direct | 1 | ||||
| -rw-r--r-- | minecraft/tasks/adoptopenjdk.yaml | 21 | ||||
| -rw-r--r-- | minecraft/tasks/main.yaml | 5 | ||||
| -rw-r--r-- | rpi-base/defaults/main.yaml | 1 |
5 files changed, 29 insertions, 8 deletions
diff --git a/minecraft/defaults/main.yaml b/minecraft/defaults/main.yaml index 52dfa4f..ec00909 100644 --- a/minecraft/defaults/main.yaml +++ b/minecraft/defaults/main.yaml @@ -7,8 +7,7 @@ minecraft_motd: "A Minecraft Server" minecraft_mem: "2G" minecraft_seed: "" -minecraft_paper_version: "1.16.5" -minecraft_paper_build: "629" -minecraft_vanilla_hash: "1b557e7b033b583cd9f66746b7a9ab1ec1673ced" - -minecraft_dynmap_version: "3.1-spigot" +minecraft_paper_version: "1.17" +minecraft_paper_build: "53" +minecraft_vanilla_hash: "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e" +minecraft_dynmap_version: "3.2-beta-1-spigot" diff --git a/minecraft/files/03adoptopenjdk-direct b/minecraft/files/03adoptopenjdk-direct new file mode 100644 index 0000000..9c4706f --- /dev/null +++ b/minecraft/files/03adoptopenjdk-direct @@ -0,0 +1 @@ +Acquire::HTTP::Proxy::adoptopenjdk.jfrog.io "DIRECT"; diff --git a/minecraft/tasks/adoptopenjdk.yaml b/minecraft/tasks/adoptopenjdk.yaml new file mode 100644 index 0000000..077114e --- /dev/null +++ b/minecraft/tasks/adoptopenjdk.yaml @@ -0,0 +1,21 @@ +--- + +- 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/tasks/main.yaml b/minecraft/tasks/main.yaml index 4cc7e57..dfc5087 100644 --- a/minecraft/tasks/main.yaml +++ b/minecraft/tasks/main.yaml @@ -4,9 +4,8 @@ become: yes user: name="{{minecraft_user}}" home="{{minecraft_dir}}" -- name: install jre - become: yes - apt: name="default-jre-headless" +- name: install adoptopenjdk + include_tasks: adoptopenjdk.yaml - name: set minecraft fork set_fact: minecraft_url="{{minecraft_vanilla_url}}" diff --git a/rpi-base/defaults/main.yaml b/rpi-base/defaults/main.yaml index 737798b..bbadb4a 100644 --- a/rpi-base/defaults/main.yaml +++ b/rpi-base/defaults/main.yaml @@ -15,3 +15,4 @@ rpi_base_apt_packages: - "iperf3" - "python3-pip" - "unzip" + - "apt-transport-https" |