Merge remote-tracking branch 'origin/release/v5.0.4-pre'

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.3
+current_version = 5.0.4
 commit = false
 tag = false
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?

.travis.yml

@@ -17,6 +17,7 @@ env:
     - SCENARIO_NAME=debian-buster-spigot-fixversion
     - SCENARIO_NAME=debian-xenial-spigot-fixversion
     - SCENARIO_NAME=debian-bionic-spigot-fixversion
+    - SCENARIO_NAME=debian-disco-spigot-fixversion
     - SCENARIO_NAME=redhat-centos7-spigot-fixversion
     - SCENARIO_NAME=redhat-twentyNine-spigot-fixversion
     - SCENARIO_NAME=debian-bionic-spigot-latest
@@ -31,13 +32,14 @@ install:
   - pip install tox-travis
 script:
   - tox -e ${SCENARIO_NAME}
-  
+
 notifications:
- email: false
- webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  email: false
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
 
 branches:
   only:
-  - master
-  - develop
-  - feature/*
+    - master
+    - develop
+    - feature/*
+    - fix/*

README.md

@@ -28,7 +28,7 @@ This role installs [Minecraft](https://minecraft.net/) or [Spigot](https://www.s
 - handle utility services like [filebeat](https://www.elastic.co/de/products/beats/filebeat) or [prometheus](https://github.com/prometheus/node_exporter)
 - install additional Tools like [rcon-cli](https://github.com/itzg/rcon-cli).
 
-**All of this is needet but not a part of this role!**
+**All of this is needet but not a part of this role!**, _you will find examples at [nolte/minecraft-infrastructure](https://github.com/nolte/minecraft-infrastructure)._
 
 ## Usage
 
@@ -44,7 +44,7 @@ or add this to your ``requirements.yml``
 
 ```
 - name: nolte.minecraft
-  version: v5.0.3
+  version: v5.0.4
 ```
 
 and execute ``ansible-galaxy install -r requirements.yml``
@@ -60,7 +60,7 @@ and execute ``ansible-galaxy install -r requirements.yml``
 ## Requirements
 
 -  Python 2.7 on the Ansible control machine to generate user ACLs
--  Ansible 2.4.0+ on the control machine to fetch the Minecraft version
+-  Ansible 2.7.0+ on the control machine to fetch the Minecraft version
 
 
 ## Contributing

docs/conf.py

@@ -23,7 +23,7 @@
 
 # General information about the project.
 project = "Ansible Minecraft Role"
-version = "5.0.3"
+version = "5.0.4"
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/usage/index.rst

@@ -34,7 +34,7 @@ List this ``role`` under the ``requirements.yml`` file.
 
     ...
     - name: nolte.minecraft
-      version: 5.0.3
+      version: 5.0.4
     ...
 
 .. warning::

meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
   author: DevOps Co-op + Nolte
   description: Provision a vanilla and Spigot Minecraft server
   license: Apache 2.0
-  min_ansible_version: 2.4
+  min_ansible_version: 2.7
   github_branch: master
   platforms:
     - name: Ubuntu

molecule/spigot_with_plugins/Dockerfile.j2

@@ -6,9 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 python-apt aptitude && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install /usr/bin/python3 /usr/bin/python3-config /usr/bin/dnf-3 sudo bash iproute && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y /usr/bin/python /usr/bin/python2-config sudo yum-plugin-ovl bash iproute && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml iproute2 && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi

requirementsDev.txt

@@ -1,4 +1,4 @@
-ansible==2.8.1
-molecule==2.20.1
+ansible==2.8.6
+molecule==2.22
 docker-py==1.10.6
-testinfra==3.0.5
+testinfra==3.2.0

requirementsDocs.txt

@@ -1,5 +1,5 @@
-sphinx==2.0.1
-sphinxcontrib-plantuml==0.15
+sphinx==2.1.2
+sphinxcontrib-plantuml==0.17.1
 sphinxcontrib-ansibleautodoc==0.0.5
 sphinx_rtd_theme==0.4.3
 PyYAML>=4.2b1

tasks/download/spigot.yml

@@ -11,7 +11,7 @@
   until: get_res is success
 
 - name: build Spigot server
-  command: java -jar BuildTools.jar --rev "{{ minecraft_version_int }}"
+  command: java -Xmx{{ minecraft_max_memory }} -Xms{{ minecraft_initial_memory }} -jar BuildTools.jar --rev "{{ minecraft_version_int }}"
   args:
     creates: "spigot-{{ minecraft_version_int }}.jar"
     chdir: "{{ deploy_helper.new_release_path }}"

tox.ini

@@ -26,7 +26,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
 
 [tox]
 #envlist = fix_lint,docs,test-{debian,redhat}-{stretch,xenial}-{spigot,vanilla}-{latest,fixversion,oldversion}-{systemd},plugins
-envlist = {debian,redhat}-{stretch,xenial}-{spigot,vanilla}-{latest,fixversion,oldversion}
+envlist = {debian,redhat}-{stretch,xenial,disco}-{spigot,vanilla}-{latest,fixversion,oldversion}
 skipsdist=True
 
 # execute molecule tests
@@ -44,6 +44,7 @@ setenv =
     trusty: MOL_IMAGE = "ubuntu:14.04"
     xenial: MOL_IMAGE = "solita/ubuntu-systemd:16.04"
     bionic: MOL_IMAGE = "solita/ubuntu-systemd:18.04"
+    disco: MOL_IMAGE = "nestybox/ubuntu-disco-docker:latest"
     twentyNine: MOL_IMAGE = "fedora:29"
     centos7: MOL_IMAGE = "centos:7"
     spigot: MC_SERVER_TYPE = spigot
@@ -77,6 +78,19 @@ deps= -r{toxinidir}/requirementsDev.txt
 commands =
   molecule --env-file ./molecule/resources/envs-blanko.yml test -s spigot_with_plugins
 
+[testenv:plugins_minimal_ansible]
+setenv =
+    user_accept_minecraft_eula={env:mc_accept_eula}
+    mc_accept_eula={env:mc_accept_eula}
+    MOL_TESTINFRA_UNIT_REPORT={envtmpdir}/molecule-report.xml
+deps= 
+  ansible==2.7.1
+  molecule==2.20.1
+  docker-py==1.10.6
+  testinfra==3.0.5
+commands =
+  molecule --env-file ./molecule/resources/envs-blanko.yml test -s spigot_with_plugins
+
 [testenv:release]
 deps=
   bumpversion