Merge branch 'master' into feature/custom-servers

Author: benwebber

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.0
+current_version = 3.1.0
 commit = True
 tag = True
 

.travis.yml

@@ -11,10 +11,12 @@ env:
     - OS=jessie64 SERVER=minecraft PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=minecraft PROCESS_CONTROL=supervisor
     - OS=trusty64 SERVER=minecraft PROCESS_CONTROL=supervisor
+    - OS=xenial64 SERVER=minecraft PROCESS_CONTROL=systemd
     - OS=centos7  SERVER=minecraft PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=spigot    PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=spigot    PROCESS_CONTROL=supervisor
     - OS=trusty64 SERVER=spigot    PROCESS_CONTROL=supervisor
+    - OS=xenial64 SERVER=spigot    PROCESS_CONTROL=systemd
     - OS=centos7  SERVER=spigot    PROCESS_CONTROL=systemd
 before_install:
   - sudo -E ./scripts/install-docker.sh

CHANGELOG.rst

@@ -16,6 +16,28 @@ Fixed
 - When using ``curl`` to check the latest release, execute the task locally
   instead of on the remote host.
 
+3.1.0 (2016-12-10)
+------------------
+
+Added
+~~~~~
+
+- Add support for Ubuntu 16.04 LTS (using systemd).
+
+Fixed
+~~~~~
+
+- Downgrade Travis CI Docker version by force to resolve build error.
+- Remove unsupported Debian version from Galaxy metadata.
+
+3.0.1 (2016-12-10)
+------------------
+
+Fixed
+~~~~~
+
+-  (`#9 <https://github.com/benwebber/ansible-minecraft/isues/9>`__) Fixed `RuntimeError` regression when building ACL files.
+
 3.0.0 (2016-07-15)
 ------------------
 

README.rst

@@ -25,7 +25,7 @@ Requirements
 Features
 --------
 
--  supports Debian 8, Ubuntu 14.04, and RHEL/CentOS 7
+-  supports Debian 8, Ubuntu 14.04, Ubuntu 16.04, and RHEL/CentOS 7
 -  supports different process supervisors on different platforms
 
    +----------------+--------------+-----------+
@@ -35,6 +35,8 @@ Features
    +----------------+--------------+-----------+
    | Ubuntu 14.04   | ✓            |           |
    +----------------+--------------+-----------+
+   | Ubuntu 16.04   |              | ✓         |
+   +----------------+--------------+-----------+
    | CentOS 7       |              | ✓         |
    +----------------+--------------+-----------+
 

docker-compose.yml

@@ -11,3 +11,7 @@ services:
   trusty64:
     build: docker/trusty64/
     entrypoint: /sbin/init
+  xenial64:
+    build: docker/xenial64/
+    privileged: true
+    entrypoint: /sbin/init

docker/jessie64/Dockerfile

@@ -9,9 +9,6 @@ ENV TERM=xterm
 # Defaults to graphical.target.
 RUN systemctl set-default multi-user.target
 
-RUN grep -rl httpredir.debian.org /etc/apt/sources.list* \
-    | xargs sed -i 's/httpredir.debian.org/ftp.us.debian.org/g'
-
 RUN apt-get update -y \
     && apt-get --no-install-recommends install -y \
       default-jdk \

docker/xenial64/Dockerfile

@@ -0,0 +1,20 @@
+# vim: set ft=dockerfile:
+
+FROM ubuntu:xenial
+
+# Colour output.
+ENV TERM=xterm
+
+RUN apt-get update -y \
+    && apt-get install -y software-properties-common \
+    && apt-add-repository ppa:ansible/ansible \
+    && apt-get update -y \
+    && apt-get --no-install-recommends install -y \
+      ansible \
+      net-tools \
+      ruby2.3 \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN gem2.3 install serverspec

library/minecraft_server_file.py

@@ -137,7 +137,7 @@ class ServerProperties(ServerFile):
     VALUES_TYPE = dict
 
     def __init__(self, module):
-        super(self.__class__, self).__init__(module)
+        super(ServerProperties, self).__init__(module)
         self._content_changed = False
         self.newlines = []
         properties = self.values.copy()
@@ -182,7 +182,7 @@ class ACL(ServerFile):
     A Minecraft ACL.
     """
     def __init__(self, module):
-        super(self.__class__, self).__init__(module)
+        super(ACL, self).__init__(module)
         self.acl = []
 
     @property
@@ -214,7 +214,7 @@ class Banlist(ACL):
     A generic Minecraft banlist.
     """
     def __init__(self, module, created=None, expires=None, reason=None):
-        super(self.__class__, self).__init__(module)
+        super(Banlist, self).__init__(module)
         self.created = created if created else dt.utcnow()
         self.expires = expires if expires else DEFAULT_BAN_EXPIRES
         self.reason = reason if reason else DEFAULT_BAN_REASON
@@ -235,7 +235,7 @@ class BannedPlayers(Banlist):
     The module "values" argument should be a list of usernames.
     """
     def __init__(self, module):
-        super(self.__class__, self).__init__(module)
+        super(BannedPlayers, self).__init__(module)
         uuids = get_uuids(self.values)
         for username, u in uuids.items():
             entry = self.template.copy()
@@ -251,7 +251,7 @@ class BannedIPs(Banlist):
     The module "values" argument should be a list of IP addresses.
     """
     def __init__(self, module):
-        super(self.__class__, self).__init__(module)
+        super(BannedIPs, self).__init__(module)
         for ip in self.values:
             entry = self.template.copy()
             entry['ip'] = ip
@@ -268,7 +268,7 @@ def __init__(self, module):
         """
         Generate a Minecraft whitelist from a list of usernames.
         """
-        super(self.__class__, self).__init__(module)
+        super(Whitelist, self).__init__(module)
         uuids = get_uuids(self.values)
         for username, u in uuids.items():
             self.acl.append({'name': username, 'uuid': u})
@@ -284,7 +284,7 @@ def __init__(self, module):
         """
         Generate a Minecraft oplist from a list of usernames.
         """
-        super(self.__class__, self).__init__(module)
+        super(Oplist, self).__init__(module)
         for entry in self.acl:
             entry['level'] = MINECRAFT_OP_CODE
 

meta/main.yml

@@ -8,9 +8,9 @@ galaxy_info:
     - name: Ubuntu
       versions:
       - trusty
+      - xenial
     - name: Debian
       versions:
-      - wheezy
       - jessie
     - name: EL
       versions:

scripts/install-docker.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine="${DOCKER_VERSION}"
+apt-get -o Dpkg::Options::="--force-confnew" install --force-yes -y docker-engine="${DOCKER_VERSION}"
 
 curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" > /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose