Make javaagent optional (#33)

* Make javaagent optional

* lint

README.md

@@ -1,8 +1,6 @@
 # ansible-role-mcs
 
 [![CircleCI](https://circleci.com/gh/SimplyVanilla/ansible-role-mcs/tree/main.svg?style=svg)](https://circleci.com/gh/SimplyVanilla/ansible-role-mcs/tree/main)
-[![Ansible Quality Score](https://img.shields.io/ansible/quality/59026?style=flat-square)](https://galaxy.ansible.com/simplyvanilla/mcs)
-[![Ansible Role](https://img.shields.io/ansible/role/d/59026?style=flat-square)](https://galaxy.ansible.com/simplyvanilla/mcs)
 
 Ansible role that installs [PaperMC](https://papermc.io/) or [Pufferfish(+)](https://pufferfish.host/)
 (Minecraft Server Java forks) on Debian-like systems.
@@ -37,7 +35,7 @@ mcs_user: 'mcs'
 mcs_path: '/home/mcs/server'
 
 # Jolokia version (JMX gateway)
-mcs_jolokia_version: '1.7.2'
+mcs_jolokia_version: '2.0.1'
 
 # JVM Heap size in GB
 mcs_heap: 10

defaults/main.yml

@@ -8,8 +8,6 @@ mcs_user: 'mcs'
 
 mcs_path: '/home/mcs/server'
 
-mcs_jolokia_version: '2.0.1'
-
 mcs_heap: 10
 
 mcs_daily_restart: ''

tasks/main.yml

@@ -14,6 +14,9 @@
 
 - name: Import o11y.yml
   ansible.builtin.import_tasks: o11y.yml
+  when:
+    - mcs_jolokia_version is defined
+    - mcs_jolokia_version
 
 - name: Import daily-restart.yml
   ansible.builtin.import_tasks: daily-restart.yml

templates/default.conf

@@ -1,8 +1,6 @@
 JAVA_HOME="{{ jname.stdout }}"
 
 JAVA_OPTS=-Xms{{ mcs_heap }}g -Xmx{{ mcs_heap }}g \
-  -XX:+UnlockExperimentalVMOptions \
-  -XX:+AlwaysPreTouch \
   {% if mcs_use_large_pages %}
   -XX:+UseLargePages \
   -XX:LargePageSizeInBytes=2M \
@@ -38,7 +36,11 @@ JAVA_OPTS=-Xms{{ mcs_heap }}g -Xmx{{ mcs_heap }}g \
   {% if mcs_fork == 'pufferfish' or mcs_fork == 'pufferfishplus' %}
   --add-modules=jdk.incubator.vector \
   {% endif %}
-  -javaagent:/opt/jolokia/jolokia-jvm-{{ mcs_jolokia_version }}.jar
+  {% if mcs_jolokia_version is defined and mcs_jolokia_version != '' %}
+  -javaagent:/opt/jolokia/jolokia-jvm-{{ mcs_jolokia_version }}.jar \
+  {% endif %}
+  -XX:+UnlockExperimentalVMOptions \
+  -XX:+AlwaysPreTouch
 
 {% if mcs_fork == 'paper' %}
 JAR="{{ papermc_api_build.json.downloads.application.name }}"