diff --git a/playbooks/home_game.yml b/playbooks/home_game.yml index b4015f7..45588dd 100755 --- a/playbooks/home_game.yml +++ b/playbooks/home_game.yml @@ -8,6 +8,7 @@ include_tasks: tasks/game/{{ item }} with_items: - minecraft-botaniapack2-survival.yml + - minecraft-botaniapack2-creative.yml tags: [ always ] roles: - role: backup @@ -17,4 +18,5 @@ - /etc backup_s3backup_exclude_list_extra: - /data/minecraft/botaniapack2-survival/backups + - /data/minecraft/botaniapack2-creative/backups tags: [ backup ] diff --git a/playbooks/tasks/game/minecraft-botaniapack2-creative.yml b/playbooks/tasks/game/minecraft-botaniapack2-creative.yml index fcaf884..f1114eb 100644 --- a/playbooks/tasks/game/minecraft-botaniapack2-creative.yml +++ b/playbooks/tasks/game/minecraft-botaniapack2-creative.yml @@ -2,7 +2,7 @@ - name: docker deploy minecraft botaniapack2-creative docker_container: name: botaniapack2-creative - state: absent + state: started image: rehashedsalt/minecraft-forge:1.16.5-36.2.22-openjdk11 restart_policy: unless-stopped pull: yes @@ -13,12 +13,12 @@ JRE_XMS: 3G FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-botaniapack2/latest.zip" ports: - - "25565:25565/tcp" - - "25565:25565/udp" + - "40502:25565/tcp" + - "40502:25565/udp" volumes: - /data/minecraft/botaniapack2-creative/backups:/minecraft/backups - /data/minecraft/botaniapack2-creative/logs:/minecraft/logs - - /data/minecraft/botaniapack2-creative/world:/minecraft/world - /data/minecraft/botaniapack2-creative/ops.json:/minecraft/ops.json - /data/minecraft/botaniapack2-creative/server.properties:/minecraft/server.properties + - /data/minecraft/botaniapack2-creative/world:/minecraft/world tags: [ docker, minecraft, botania, creative ] diff --git a/playbooks/tasks/game/minecraft-botaniapack2-survival.yml b/playbooks/tasks/game/minecraft-botaniapack2-survival.yml index f562045..f600d79 100644 --- a/playbooks/tasks/game/minecraft-botaniapack2-survival.yml +++ b/playbooks/tasks/game/minecraft-botaniapack2-survival.yml @@ -18,7 +18,7 @@ volumes: - /data/minecraft/botaniapack2-survival/backups:/minecraft/backups - /data/minecraft/botaniapack2-survival/logs:/minecraft/logs - - /data/minecraft/botaniapack2-survival/world:/minecraft/world - /data/minecraft/botaniapack2-survival/ops.json:/minecraft/ops.json - /data/minecraft/botaniapack2-survival/server.properties:/minecraft/server.properties + - /data/minecraft/botaniapack2-survival/world:/minecraft/world tags: [ docker, minecraft, botania, survival ] diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml index 50d2993..3142917 100644 --- a/roles/common/tasks/packages.yml +++ b/roles/common/tasks/packages.yml @@ -20,6 +20,7 @@ - openssh-server - pwgen - python-is-python3 # God damn you Nextcloud role + - python2 # Needed for some legacy crap - python3-apt - python3-boto - python3-boto3 diff --git a/roles/nagios/templates/nagios-ansible.cfg.j2 b/roles/nagios/templates/nagios-ansible.cfg.j2 index 2779a5f..23e9a1e 100644 --- a/roles/nagios/templates/nagios-ansible.cfg.j2 +++ b/roles/nagios/templates/nagios-ansible.cfg.j2 @@ -152,6 +152,17 @@ define host { # Updated: {{ service.value.last_updated }} {% for tag in service.value.tags %} {# #} +{% if tag.slug == "nagios-checkminecraft" %} +{% for port in service.value.ports %} +define service { + use ansible-generic-service + service_description Minecraft - {{ service.value.name }} - {{ port }} + check_command check_by_ssh!/usr/local/bin/monitoring-scripts/check_minecraft -H {{ host_name }} -p {{ port }} -m "{{ service.value.description }}" -f -w 3 -c 5 + host_name {{ host_name }} +} +{% endfor %} +{% endif %} +{# #} {% if tag.slug == "nagios-checkhttp" %} {% for port in service.value.ports %} define service {