diff --git a/roles/server/minecraft/defaults/main.yml b/roles/server/minecraft/defaults/main.yml index dcee064..1cbc303 100644 --- a/roles/server/minecraft/defaults/main.yml +++ b/roles/server/minecraft/defaults/main.yml @@ -16,6 +16,7 @@ minecraft_source_link: "{{ lookup('pipe', minecraft_source_link_generator) }}" # minecraft_port: "25565" minecraft_rcon_port: "25575" minecraft_rcon_password: "{{ lookup('password', 'credentials/' + inventory_hostname + '/' + domain + '/rcon length=80') }}" +java_version: 11 minecraft_start_ram: "1G" minecraft_max_ram: "1G" minecraft_difficulty: "normal" diff --git a/roles/server/minecraft/tasks/main.yml b/roles/server/minecraft/tasks/main.yml index f3c2cca..230c87c 100644 --- a/roles/server/minecraft/tasks/main.yml +++ b/roles/server/minecraft/tasks/main.yml @@ -4,7 +4,7 @@ apt: state: present name: - - openjdk-11-jre-headless + - openjdk-{{ java_version }}-jre-headless - name: Create required read only directories file: diff --git a/roles/server/minecraft/templates/minecraft.service b/roles/server/minecraft/templates/minecraft.service index 5c24f87..f29fd7d 100644 --- a/roles/server/minecraft/templates/minecraft.service +++ b/roles/server/minecraft/templates/minecraft.service @@ -19,5 +19,5 @@ InaccessibleDirectories=/root /sys /srv -/opt /media -/lost+found ReadOnlyDirectories={{ installation_directory }} ReadWriteDirectories={{ data_directory }} WorkingDirectory={{ data_directory }} -ExecStart=/usr/lib/jvm/java-11-openjdk-amd64/bin/java -Xms{{ minecraft_start_ram | quote }} -Xmx{{ minecraft_max_ram | quote }} -jar {{ installation_directory | quote }}/server.jar nogui +ExecStart=/usr/lib/jvm/java-{{ java_version }}-openjdk-amd64/bin/java -Xms{{ minecraft_start_ram | quote }} -Xmx{{ minecraft_max_ram | quote }} -jar {{ installation_directory | quote }}/server.jar nogui ExecStop={{ remote_control_script }} stop