From 9f75013ab183dd9209cf50dec2151d7edc616b2c Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 28 Mar 2016 14:52:04 +0200
Subject: [PATCH 01/31] Add LAN_ONLY option to the docs

---
 docs/configuration.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/configuration.md b/docs/configuration.md
index 122f50f..21ec13e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -63,6 +63,11 @@ Controls if the server is listed and accessible publicly.
 - true
 - false *[default]*
 
+**LAN_ONLY**  
+Controls if the server is accessible from LAN only.
+- true
+- false *[default]*
+
 **MAX_PLAYERS**  
 Sets the maximum number of allowed players to connect and play simultaneously. Heavily influences
 overall performance and gameplay-experience of the server. Be sure the hardware has enough power

From 8626b9992ea691d51d323bbe26cb5e17218d87d5 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 28 Mar 2016 14:52:35 +0200
Subject: [PATCH 02/31] Optimize docs text slightly

---
 docs/configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 21ec13e..e548966 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -92,14 +92,14 @@ Defines which game-mode the server runs on.
 - wilderness
 
 **INTENTION**  
-Configures the server's gameplay-intention for players. The default value depends on **GAME_MODE**
+Configures the server's gameplay-intention for players. The default value depends on **GAME_MODE**.
 - social
 - cooperative
 - competitive
 - madness
 
 **AUTOSAVER_ENABLE**  
-Enables/disables automatic saving of the world's state after each ingame-day.
+Enables/disables automatic saving of the world's state after each in-game day.
 - true *[default]*
 - false
 

From 09005c1eea8da3dcfc8673d0bb8416894d922b51 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 27 Apr 2016 19:27:11 +0200
Subject: [PATCH 03/31] Add support for the language_code configuration option

---
 CHANGELOG.md                  |  3 +++
 build/static/boot/settings.sh |  7 ++++++-
 docs/configuration.md         | 35 ++++++++++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c2defc..447dc4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [next]
 
+### Added
+- Add `LANGUAGE` environment variable for setting the server's language.
+
 ## [0.5.0]
 
 ### Added
diff --git a/build/static/boot/settings.sh b/build/static/boot/settings.sh
index 11a50eb..76e2567 100755
--- a/build/static/boot/settings.sh
+++ b/build/static/boot/settings.sh
@@ -15,6 +15,10 @@ fi
 
 source "`dirname "$0"`/aux.sh"
 
+validate_option "LANGUAGE" \
+	brazilian bulgarian czech danish dutch english finnish french german \
+	greek hungarian italian japanese korean norwegian polish portuguese \
+	romanian russian schinese spanish swedish tchinese thai turkish ukrainian
 validate_port "SERVER_PORT"
 validate_bool "OFFLINE_ENABLE"
 validate_int "MAX_PLAYERS" 1 64
@@ -61,11 +65,12 @@ if [[ ! -f $file_cluster ]]; then
 	conf "tick_rate" "$TICK_RATE"
 	conf "whitelist_slots" "$WHITELIST_SLOTS"
 
-	if [[ -n "$CONSOLE_ENABLE" ]] || [[ -n "$MAX_SNAPSHOTS" ]]; then
+	if [[ -n "$CONSOLE_ENABLE" ]] || [[ -n "$MAX_SNAPSHOTS" ]] || [[ -n "$LANGUAGE" ]]; then
 		echo
 		echo "[MISC]"
 		conf "console_enabled" "$CONSOLE_ENABLE"
 		conf "max_snapshots" "$MAX_SNAPSHOTS"
+		conf "language_code" "$LANGUAGE"
 	fi
 
 	if [[ "$SHARD_ENABLE" == "true" ]]; then
diff --git a/docs/configuration.md b/docs/configuration.md
index e548966..9fef6c7 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -46,13 +46,42 @@ Setting a custom server-name is not required but highly recommended.
 If no name is configured, a random name will be generated.
 - *text* *[default: *RANDOM*]*
 
+**NAME_PREFIX**  
+Defines text to prepend to the server's name.
+- *text*
+
 **DESCRIPTION**  
 Sets the server's description. Shows up on the public server-list and in-game.
 - *text* *[default: Powered by DST-Academy.]*
 
-**NAME_PREFIX**  
-Defines text to prepend to the server's name.
-- *text*
+**LANGUAGE**
+Sets the server's language.
+- brazilian
+- bulgarian
+- czech
+- danish
+- dutch
+- english *[default]*
+- finnish
+- french
+- german
+- greek
+- hungarian
+- italian
+- japanese
+- korean
+- norwegian
+- polish
+- portuguese
+- romanian
+- russian
+- schinese
+- spanish
+- swedish
+- tchinese
+- thai
+- turkish
+- ukrainian
 
 **PASSWORD**  
 Defines a server password so only players knowing the password can connect.

From b89d2c062dda5b2e9cb683e130e17695510c98d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Wed, 25 May 2016 20:10:29 +0200
Subject: [PATCH 04/31] Fix tests

---
 test/close-cleanly/run.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/close-cleanly/run.sh b/test/close-cleanly/run.sh
index f71b9c3..14ac8aa 100755
--- a/test/close-cleanly/run.sh
+++ b/test/close-cleanly/run.sh
@@ -15,7 +15,7 @@ sleep 20
 docker stop $container_id >/dev/null || exit 1
 docker cp $container_id:/var/lib/dsta/cluster/shard/server_log.txt $file1
 docker rm -fv $container_id > /dev/null
-grep -q "^Shutting down$" $file1 || exit 1
+grep -q "Shutting down$" $file1 || exit 1
 
 # Dirty console
 container_id=`docker run -d $1 dst-server start --update=none || exit 1`
@@ -25,7 +25,7 @@ docker exec $container_id /commands.sh || exit 1
 docker stop $container_id >/dev/null || exit 1
 docker cp $container_id:/var/lib/dsta/cluster/shard/server_log.txt $file1
 docker rm -fv $container_id > /dev/null
-grep -q "^Shutting down$" $file1 || exit 1
+grep -q "Shutting down$" $file1 || exit 1
 
 # TERM
 container_id=`docker run -d $1 dst-server start --update=none || exit 1`
@@ -35,7 +35,7 @@ timeout --kill-after 1 12 docker wait $container_id > $file1
 grep -q "^0$" $file1 || exit 1
 docker cp $container_id:/var/lib/dsta/cluster/shard/server_log.txt $file1
 docker rm -fv $container_id > /dev/null
-grep -q "^Shutting down$" $file1 || exit 1
+grep -q "Shutting down$" $file1 || exit 1
 
 # INT
 container_id=`docker run -d $1 dst-server start --update=none || exit 1`
@@ -45,4 +45,4 @@ timeout --kill-after 1 12 docker wait $container_id > $file1
 grep -q "^0$" $file1 || exit 1
 docker cp $container_id:/var/lib/dsta/cluster/shard/server_log.txt $file1
 docker rm -fv $container_id > /dev/null
-grep -q "^Shutting down$" $file1 || exit 1
+grep -q "Shutting down$" $file1 || exit 1

From bf3f8d1c4f5390671fa297d2a4abdf99a16c35b4 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 11 Jul 2016 12:02:55 +0200
Subject: [PATCH 05/31] Create dedicated document listing maintainers

---
 MAINTAINERS.md   | 7 +++++++
 build/Dockerfile | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 MAINTAINERS.md

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 0000000..c56d246
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,7 @@
+# Maintainers
+> List of project maintainers.
+
+## Core Maintainers
+
+- [Thomas Deinhamer](https://github.com/thasmo) / [@thomasdeinhamer](https://twitter.com/thomasdeinhamer)
+- [Brais Gabín](https://github.com/BraisGabin) / [@braisgabin](https://twitter.com/braisgabin)
diff --git a/build/Dockerfile b/build/Dockerfile
index 06a2e7a..9c46786 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:jessie
-MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
+MAINTAINER DST Academy <support@dst.academy>
 
 # Install dependencies.
 RUN dpkg --add-architecture i386 \

From 66f7575798b633459166041e6e5e5549dcaa0e22 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 11 Jul 2016 12:59:18 +0200
Subject: [PATCH 06/31] Update gosu to version 1.9

---
 build/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 9c46786..75cefa9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -15,8 +15,8 @@ RUN dpkg --add-architecture i386 \
 
 # Install gosu.
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& curl -o /usr/local/bin/gosu -fsSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
-	&& curl -o /usr/local/bin/gosu.asc -fsSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
+	&& curl -o /usr/local/bin/gosu -fsSL "https://github.com/tianon/gosu/releases/download/1.9/gosu-$(dpkg --print-architecture)" \
+	&& curl -o /usr/local/bin/gosu.asc -fsSL "https://github.com/tianon/gosu/releases/download/1.9/gosu-$(dpkg --print-architecture).asc" \
 	&& gpg --verify /usr/local/bin/gosu.asc \
 	&& rm /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu

From fd1042b3715cb1b7188bd45c06cf6f691cd5a8df Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 11 Jul 2016 13:34:43 +0200
Subject: [PATCH 07/31] Remove deprecated console arguments

---
 build/script/dontstarve_dedicated_server_nullrenderer | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/script/dontstarve_dedicated_server_nullrenderer b/build/script/dontstarve_dedicated_server_nullrenderer
index 4ac9095..23d78f3 100755
--- a/build/script/dontstarve_dedicated_server_nullrenderer
+++ b/build/script/dontstarve_dedicated_server_nullrenderer
@@ -8,9 +8,8 @@ fi
 sleep infinity > $DSTA_HOME/console &
 
 cd $DST_HOME/bin
+
 exec ./dontstarve_dedicated_server_nullrenderer \
-	-console \
-	-backup_logs \
 	-persistent_storage_root `dirname $CLUSTER_PATH` \
 	-conf_dir "." \
 	-cluster `basename $CLUSTER_PATH` \

From c3b12c568fe6caabbb12779c717784cd5ed98c13 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 11 Jul 2016 15:25:24 +0200
Subject: [PATCH 08/31] Implement the version command

---
 build/static/bin/version.sh       | 34 +++++++++++++++++++++++++++++++
 build/static/doc/dst-server.usage |  1 +
 build/static/doc/version.usage    |  8 ++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 build/static/bin/version.sh
 create mode 100644 build/static/doc/version.usage

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
new file mode 100644
index 0000000..5769477
--- /dev/null
+++ b/build/static/bin/version.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+usage(){
+	cat $DSTA_HOME/doc/version.usage
+}
+
+if [ "$1" == "--help" ]; then
+	usage
+	exit 0
+elif [ $# -eq 1 ]; then
+	case $1 in
+		--upstream)
+			rm -rf $STEAM_HOME/Steam/appcache/*
+			steamcmd +login anonymous +app_info_update 1 +app_info_print 343050 +quit | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+			exit 0
+			;;
+
+		--check)
+			version_local=$(dst-server version)
+			version_upstream=$(dst-server version --upstream)
+
+			if [ "$version_local" -eq "$version_upstream" ]; then
+				echo "Version is up to date.";
+				exit 0;
+			else
+				echo "Version is outdated.";
+				exit 1;
+			fi
+			;;
+	esac
+else
+	cat $DST_HOME/steamapps/appmanifest_343050.acf | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+	exit 0
+fi
diff --git a/build/static/doc/dst-server.usage b/build/static/doc/dst-server.usage
index cb6ac3d..1bd34ca 100644
--- a/build/static/doc/dst-server.usage
+++ b/build/static/doc/dst-server.usage
@@ -5,5 +5,6 @@ The commands are:
    console  Execute commands in the server console
    update   Update game and/or mods
    log      Show a log
+   version  Show the current server version
 
 See 'dst-server help <command>' to read about a specific command.
diff --git a/build/static/doc/version.usage b/build/static/doc/version.usage
new file mode 100644
index 0000000..ece4912
--- /dev/null
+++ b/build/static/doc/version.usage
@@ -0,0 +1,8 @@
+usage: dst-server version [<args>]
+
+Print the currently running version of the DST server.
+
+   --upstream
+      Return the currently released upstream version.
+   --check
+      Check if the currently running version is up to date.

From fb0f928addd449067e988709e1e90ac5cb018ad7 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 11 Jul 2016 15:26:07 +0200
Subject: [PATCH 09/31] Fix typo

---
 build/static/doc/dst-server.usage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/static/doc/dst-server.usage b/build/static/doc/dst-server.usage
index 1bd34ca..35d1283 100644
--- a/build/static/doc/dst-server.usage
+++ b/build/static/doc/dst-server.usage
@@ -2,7 +2,7 @@ usage: dst-server [--help] <command> [<args>]
 
 The commands are:
    start    Start the server
-   console  Execute commands in the server console
+   console  Execute commands on the server console
    update   Update game and/or mods
    log      Show a log
    version  Show the current server version

From ce800f04e6fd7de5e2d6a1dea3fa068cff43a9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Mon, 11 Jul 2016 22:23:08 +0200
Subject: [PATCH 10/31] Fix tests

---
 test/dsta-help/run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/dsta-help/run.sh b/test/dsta-help/run.sh
index b307814..6c276b8 100755
--- a/test/dsta-help/run.sh
+++ b/test/dsta-help/run.sh
@@ -14,9 +14,10 @@ usage: dst-server [--help] <command> [<args>]
 
 The commands are:
    start    Start the server
-   console  Execute commands in the server console
+   console  Execute commands on the server console
    update   Update game and/or mods
    log      Show a log
+   version  Show the current server version
 
 See 'dst-server help <command>' to read about a specific command.
 EOF

From 0773e34aa635641a2a97d1b9852410afd3903667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Thu, 21 Jul 2016 01:05:52 +0200
Subject: [PATCH 11/31] Useless flag

---
 build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 75cefa9..8647517 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER DST Academy <support@dst.academy>
 
 # Install dependencies.
 RUN dpkg --add-architecture i386 \
-	&& apt-get update -y \
+	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
 		ca-certificates \
 		curl \

From 02de77ceec80d480cd8bfb0e25df385ba5138203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Thu, 21 Jul 2016 01:19:04 +0200
Subject: [PATCH 12/31] Use dstacademy/steamcmd image

---
 build/Dockerfile      | 28 ++--------------------------
 build/script/steamcmd |  7 -------
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100755 build/script/steamcmd

diff --git a/build/Dockerfile b/build/Dockerfile
index 8647517..6ce63d9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,43 +1,19 @@
-FROM debian:jessie
+FROM dstacademy/steamcmd
 MAINTAINER DST Academy <support@dst.academy>
 
 # Install dependencies.
 RUN dpkg --add-architecture i386 \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
-		ca-certificates \
-		curl \
-		lib32gcc1 \
 		lib32stdc++6 \
 		libcurl4-gnutls-dev:i386 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Install gosu.
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-	&& curl -o /usr/local/bin/gosu -fsSL "https://github.com/tianon/gosu/releases/download/1.9/gosu-$(dpkg --print-architecture)" \
-	&& curl -o /usr/local/bin/gosu.asc -fsSL "https://github.com/tianon/gosu/releases/download/1.9/gosu-$(dpkg --print-architecture).asc" \
-	&& gpg --verify /usr/local/bin/gosu.asc \
-	&& rm /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu
-
-ENV STEAM_USER="steam" \
-	STEAM_HOME="/opt/steam" \
-	DST_HOME="/opt/dst" \
+ENV DST_HOME="/opt/dst" \
 	DSTA_HOME="/usr/local/share/dsta" \
 	CLUSTER_PATH="/var/lib/dsta/cluster"
 
-# Add steam user.
-RUN adduser --disabled-login --gecos "Steam" --home $STEAM_HOME $STEAM_USER
-
-# Install SteamCMD.
-RUN curl -fsSL "https://cdn.steamstatic.com/client/installer/steamcmd_linux.tar.gz" | gosu $STEAM_USER tar -xzvC $STEAM_HOME \
-	&& gosu $STEAM_USER $STEAM_HOME/steamcmd.sh \
-		+@ShutdownOnFailedCommand 1 \
-		+quit \
-	&& rm -rf $STEAM_HOME/Steam/logs $STEAM_HOME/Steam/appcache/httpcache \
-	&& find $STEAM_HOME/package -type f ! -name "steam_cmd_linux.installed" ! -name "steam_cmd_linux.manifest" -delete
-
 # Install Don't Starve Together Server.
 RUN mkdir -p $DST_HOME \
 	&& chown $STEAM_USER:$STEAM_USER $DST_HOME \
diff --git a/build/script/steamcmd b/build/script/steamcmd
deleted file mode 100755
index 387786b..0000000
--- a/build/script/steamcmd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-if [ `whoami` != "$STEAM_USER" ]; then
-	exec gosu $STEAM_USER $0 "$@"
-fi
-
-$STEAM_HOME/steamcmd.sh "$@"

From 5b14eb5bac4cf335d180c6023b66a48bdae82c39 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 21 Jul 2016 22:37:01 +0200
Subject: [PATCH 13/31] Pin dstacademy/steamcmd to version 0.1.0

---
 build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 6ce63d9..a6ad6f2 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM dstacademy/steamcmd
+FROM dstacademy/steamcmd:0.1.0
 MAINTAINER DST Academy <support@dst.academy>
 
 # Install dependencies.

From bc68fff0e05da8316cf37cf5d004035230828817 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 21 Jul 2016 22:47:40 +0200
Subject: [PATCH 14/31] Update CHANGELOG

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 447dc4c..860ed4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 ### Added
 - Add `LANGUAGE` environment variable for setting the server's language.
+- Implement the `version` command.
+
+### Changed
+- Update gosu to version 1.9.
+- Use our own `steamcmd` image as base-image.
+
+### Removed
+- Remove deprecated console arguments `console` and `backup_logs`.
 
 ## [0.5.0]
 

From 876a57379b2d6760588567236908be4924db6cc2 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 21 Jul 2016 23:28:59 +0200
Subject: [PATCH 15/31] Use minor-version-tag of the steamcmd base-image

---
 build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index a6ad6f2..c227bb3 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM dstacademy/steamcmd:0.1.0
+FROM dstacademy/steamcmd:0.1
 MAINTAINER DST Academy <support@dst.academy>
 
 # Install dependencies.

From a35996947689a92030a507fc7c41374a3cd1a3be Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 23 Jul 2016 12:36:47 +0200
Subject: [PATCH 16/31] Update LICENSE

---
 LICENSE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.md b/LICENSE.md
index bce460b..cf4ff17 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Thomas "Thasmo" Deinhamer
+Copyright (c) 2015-2016 Thomas "Thasmo" Deinhamer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From dd2818e9dc37089a06e6af746840d53109cfd37f Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 23 Jul 2016 12:37:54 +0200
Subject: [PATCH 17/31] Update README

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 675b233..76b3013 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
-# DST:A Dedicated Server [![Build Status](https://travis-ci.org/dst-academy/server.svg?branch=develop)](https://travis-ci.org/dst-academy/server) [![Docker Pulls](https://img.shields.io/docker/pulls/dstacademy/server.svg)](https://hub.docker.com/r/dstacademy/server/) [![Slack Status](http://slack.dst.academy/badge.svg)](http://slack.dst.academy/)
-> Don't Starve Together Academy Dedicated Server for Docker.
+# Don't Starve Together - Dedicated Server
+> Dockerfile for [Don't Starve Together][website].
+
+[![Build Status](https://img.shields.io/travis/dst-academy/server/develop.svg)](https://travis-ci.org/dst-academy/server)
+[![GitHub Release](https://img.shields.io/github/release/dst-academy/server.svg)](https://github.com/dst-academy/server/releases/latest)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dstacademy/server.svg)](https://hub.docker.com/r/dstacademy/server/)
+[![License](https://img.shields.io/github/license/dst-academy/server.svg?maxAge=2592000?style=flat-square)]()
+[![Slack](https://img.shields.io/badge/slack-join-E01563.svg)](https://slack.dst.academy/)
+
+---
 
 This repository provides a `Dockerfile` for building the DST:A Dedicated Server
 for the online multi-player survival game [*Don't Starve Together*][website].

From c9305e312576c847d42bb7502a35a07899b74121 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 23 Jul 2016 12:44:54 +0200
Subject: [PATCH 18/31] Add Steam badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 76b3013..de51f8d 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/dstacademy/server.svg)](https://hub.docker.com/r/dstacademy/server/)
 [![License](https://img.shields.io/github/license/dst-academy/server.svg?maxAge=2592000?style=flat-square)]()
 [![Slack](https://img.shields.io/badge/slack-join-E01563.svg)](https://slack.dst.academy/)
+[![Steam](https://img.shields.io/badge/steam-join-1b2838.svg)](https://steamcommunity.com/groups/dst-academy)
 
 ---
 

From accfb67e4a4aeca39f60725eb1318f8c1209df0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 12:21:56 +0200
Subject: [PATCH 19/31] chmod +x build/static/bin/version.sh

---
 build/static/bin/version.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 build/static/bin/version.sh

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
old mode 100644
new mode 100755

From 50e4a8d2ad2262e367365cbe11284c77817cb0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 12:26:38 +0200
Subject: [PATCH 20/31] Avoid unnecesary work

---
 build/docker-entrypoint.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh
index e755236..ffeeac5 100755
--- a/build/docker-entrypoint.sh
+++ b/build/docker-entrypoint.sh
@@ -7,11 +7,13 @@ if [ $1 == "dst-server" ]; then
 	mkdir -p $CLUSTER_PATH/$SHARD_NAME
 	chown -R $STEAM_USER:$STEAM_USER $CLUSTER_PATH
 
-	$DSTA_HOME/boot/token.sh
-	$DSTA_HOME/boot/settings.sh
-	$DSTA_HOME/boot/lists.sh
-	$DSTA_HOME/boot/world.sh
-	$DSTA_HOME/boot/mods.sh
+	if [ "$2" == "start" ]; then
+		$DSTA_HOME/boot/token.sh
+		$DSTA_HOME/boot/settings.sh
+		$DSTA_HOME/boot/lists.sh
+		$DSTA_HOME/boot/world.sh
+		$DSTA_HOME/boot/mods.sh
+	fi
 fi
 
 exec "$@"

From f896e146998bf91eaaddb0966400acf67a98c80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 13:26:23 +0200
Subject: [PATCH 21/31] Add tests to version

---
 build/static/bin/version.sh    |  9 ++++++---
 build/static/doc/version.usage |  2 +-
 test/dsta-version/run.sh       | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100755 test/dsta-version/run.sh

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
index 5769477..a87963e 100755
--- a/build/static/bin/version.sh
+++ b/build/static/bin/version.sh
@@ -7,6 +7,9 @@ usage(){
 if [ "$1" == "--help" ]; then
 	usage
 	exit 0
+elif [ $# -eq 0 ]; then
+	cat $DST_HOME/steamapps/appmanifest_343050.acf | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+	exit 0
 elif [ $# -eq 1 ]; then
 	case $1 in
 		--upstream)
@@ -28,7 +31,7 @@ elif [ $# -eq 1 ]; then
 			fi
 			;;
 	esac
-else
-	cat $DST_HOME/steamapps/appmanifest_343050.acf | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
-	exit 0
 fi
+
+usage 1>&2
+exit 1
diff --git a/build/static/doc/version.usage b/build/static/doc/version.usage
index ece4912..61d3e29 100644
--- a/build/static/doc/version.usage
+++ b/build/static/doc/version.usage
@@ -1,4 +1,4 @@
-usage: dst-server version [<args>]
+usage: dst-server version [--upstream|--check]
 
 Print the currently running version of the DST server.
 
diff --git a/test/dsta-version/run.sh b/test/dsta-version/run.sh
new file mode 100755
index 0000000..16918f3
--- /dev/null
+++ b/test/dsta-version/run.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+clean() {
+	rm -f $aux $aux1
+}
+trap clean EXIT
+
+aux=`mktemp`
+aux1=`mktemp`
+
+version=`docker run --rm $1 dst-server version || exit 1`
+[[ $version =~ ^[0-9]+$ ]] || ( echo "\$version == $version" && exit 1 )
+
+version=`docker run --rm $1 dst-server version --upstream || exit 1`
+[[ $version =~ ^[0-9]+$ ]] || ( echo "\$version == $version" && exit 1 )
+
+message=`docker run --rm $1 dst-server version --check`
+if [ $? -eq 0 ]; then
+	[[ "$message" == "Version is up to date." ]] || ( echo "\$? == $? && \$message == $message" && exit 1 )
+else
+	[ "$message" == "Version is outdated." ] || ( echo "\$? == $? && \$message == $message" && exit 1 )
+fi
+
+cat > $aux <<- EOF
+usage: dst-server version [--upstream|--check]
+
+Print the currently running version of the DST server.
+
+   --upstream
+      Return the currently released upstream version.
+   --check
+      Check if the currently running version is up to date.
+EOF
+docker run --rm $1 dst-server version --help >$aux1 || exit 1
+diff $aux $aux1 || exit 1
+docker run --rm $1 dst-server version --foo >/dev/null 2>$aux1 && exit 1
+diff $aux $aux1 || exit 1

From f8f2442391300d6f049de293b5d4a47be48f74b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 13:28:23 +0200
Subject: [PATCH 22/31] Refactor DRY

---
 build/static/bin/version.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
index a87963e..5501e83 100755
--- a/build/static/bin/version.sh
+++ b/build/static/bin/version.sh
@@ -4,17 +4,21 @@ usage(){
 	cat $DSTA_HOME/doc/version.usage
 }
 
+clean_version(){
+	grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+}
+
 if [ "$1" == "--help" ]; then
 	usage
 	exit 0
 elif [ $# -eq 0 ]; then
-	cat $DST_HOME/steamapps/appmanifest_343050.acf | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+	cat $DST_HOME/steamapps/appmanifest_343050.acf | clean_version
 	exit 0
 elif [ $# -eq 1 ]; then
 	case $1 in
 		--upstream)
 			rm -rf $STEAM_HOME/Steam/appcache/*
-			steamcmd +login anonymous +app_info_update 1 +app_info_print 343050 +quit | grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
+			steamcmd +login anonymous +app_info_update 1 +app_info_print 343050 +quit | clean_version
 			exit 0
 			;;
 

From 7f86abbfe13de565130c10be00d7dfe4356ea4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 13:34:59 +0200
Subject: [PATCH 23/31] Move important code to functions

---
 build/static/bin/version.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
index 5501e83..bd52ca9 100755
--- a/build/static/bin/version.sh
+++ b/build/static/bin/version.sh
@@ -4,6 +4,15 @@ usage(){
 	cat $DSTA_HOME/doc/version.usage
 }
 
+local_version(){
+	cat $DST_HOME/steamapps/appmanifest_343050.acf | clean_version
+}
+
+upstream_version(){
+	rm -rf $STEAM_HOME/Steam/appcache/*
+	steamcmd +login anonymous +app_info_update 1 +app_info_print 343050 +quit | clean_version
+}
+
 clean_version(){
 	grep -Po -m 1 "\"buildid\"\s*\"(.*)\"" | grep -Po "\d*"
 }
@@ -12,19 +21,18 @@ if [ "$1" == "--help" ]; then
 	usage
 	exit 0
 elif [ $# -eq 0 ]; then
-	cat $DST_HOME/steamapps/appmanifest_343050.acf | clean_version
+	local_version
 	exit 0
 elif [ $# -eq 1 ]; then
 	case $1 in
 		--upstream)
-			rm -rf $STEAM_HOME/Steam/appcache/*
-			steamcmd +login anonymous +app_info_update 1 +app_info_print 343050 +quit | clean_version
+			upstream_version
 			exit 0
 			;;
 
 		--check)
-			version_local=$(dst-server version)
-			version_upstream=$(dst-server version --upstream)
+			version_local=`local_version`
+			version_upstream=`upstream_version`
 
 			if [ "$version_local" -eq "$version_upstream" ]; then
 				echo "Version is up to date.";

From a05f38ea6191a23fa92833f01541406af1af81ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sun, 24 Jul 2016 13:35:58 +0200
Subject: [PATCH 24/31] Add dst-server version --local

---
 build/static/bin/version.sh    | 5 +++++
 build/static/doc/version.usage | 4 +++-
 test/dsta-version/run.sh       | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build/static/bin/version.sh b/build/static/bin/version.sh
index bd52ca9..e2b5e61 100755
--- a/build/static/bin/version.sh
+++ b/build/static/bin/version.sh
@@ -25,6 +25,11 @@ elif [ $# -eq 0 ]; then
 	exit 0
 elif [ $# -eq 1 ]; then
 	case $1 in
+		--local)
+			local_version
+			exit 0
+			;;
+
 		--upstream)
 			upstream_version
 			exit 0
diff --git a/build/static/doc/version.usage b/build/static/doc/version.usage
index 61d3e29..ad2bdc3 100644
--- a/build/static/doc/version.usage
+++ b/build/static/doc/version.usage
@@ -1,7 +1,9 @@
-usage: dst-server version [--upstream|--check]
+usage: dst-server version [--local|--upstream|--check]
 
 Print the currently running version of the DST server.
 
+   --local
+      Return the local version.
    --upstream
       Return the currently released upstream version.
    --check
diff --git a/test/dsta-version/run.sh b/test/dsta-version/run.sh
index 16918f3..c0d9928 100755
--- a/test/dsta-version/run.sh
+++ b/test/dsta-version/run.sh
@@ -11,6 +11,9 @@ aux1=`mktemp`
 version=`docker run --rm $1 dst-server version || exit 1`
 [[ $version =~ ^[0-9]+$ ]] || ( echo "\$version == $version" && exit 1 )
 
+version=`docker run --rm $1 dst-server version --local || exit 1`
+[[ $version =~ ^[0-9]+$ ]] || ( echo "\$version == $version" && exit 1 )
+
 version=`docker run --rm $1 dst-server version --upstream || exit 1`
 [[ $version =~ ^[0-9]+$ ]] || ( echo "\$version == $version" && exit 1 )
 
@@ -22,10 +25,12 @@ else
 fi
 
 cat > $aux <<- EOF
-usage: dst-server version [--upstream|--check]
+usage: dst-server version [--local|--upstream|--check]
 
 Print the currently running version of the DST server.
 
+   --local
+      Return the local version.
    --upstream
       Return the currently released upstream version.
    --check

From a6a13bf6c71f2cbe414178b26c7135d06d86f8c8 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 27 Jul 2016 23:35:33 +0200
Subject: [PATCH 25/31] Use ARG statements in the Dockerfile where relevant

---
 build/Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index c227bb3..85837eb 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -10,9 +10,13 @@ RUN dpkg --add-architecture i386 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV DST_HOME="/opt/dst" \
-	DSTA_HOME="/usr/local/share/dsta" \
-	CLUSTER_PATH="/var/lib/dsta/cluster"
+# Define build arguments.
+ARG DST_HOME
+ENV DST_HOME ${DST_HOME:-"/opt/dst"}
+ARG DSTA_HOME
+ENV DSTA_HOME ${DSTA_HOME:-"/usr/local/share/dsta"}
+ARG CLUSTER_PATH
+ENV CLUSTER_PATH ${CLUSTER_PATH:-"/var/lib/dsta/cluster"}
 
 # Install Don't Starve Together Server.
 RUN mkdir -p $DST_HOME \

From 360691dba057ec5489d549f5c207d2e3fcbfa97e Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 14:14:06 +0200
Subject: [PATCH 26/31] Add the VOTE_ENABLE variable

---
 build/static/boot/settings.sh | 2 ++
 docs/configuration.md         | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/build/static/boot/settings.sh b/build/static/boot/settings.sh
index 76e2567..fd5d39c 100755
--- a/build/static/boot/settings.sh
+++ b/build/static/boot/settings.sh
@@ -28,6 +28,7 @@ validate_option "GAME_MODE" endless survival wilderness
 validate_option "INTENTION" cooperative social competitive madness
 validate_bool "AUTOSAVER_ENABLE"
 validate_option "TICK_RATE" 15 20 30 60
+validate_bool "VOTE_ENABLE"
 validate_bool "VOTE_KICK_ENABLE"
 validate_bool "PAUSE_WHEN_EMPTY"
 validate_bool "LAN_ONLY"
@@ -51,6 +52,7 @@ if [[ ! -f $file_cluster ]]; then
 	conf "max_players" "$MAX_PLAYERS"
 	conf "pvp" "$PVP_ENABLE"
 	conf "pause_when_empty" "$PAUSE_WHEN_EMPTY"
+	conf "vote_enabled" "$VOTE_ENABLE"
 	conf "vote_kick_enabled" "$VOTE_KICK_ENABLE"
 
 	echo
diff --git a/docs/configuration.md b/docs/configuration.md
index 9fef6c7..47677ac 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -140,6 +140,11 @@ gameplay but also more bandwidth is needed and more CPU-power is used.
 - 30
 - 60
 
+**VOTE_ENABLE**  
+Enables/disables voting on the server.
+- true *[default]*
+- false
+
 **VOTE_KICK_ENABLE**  
 Enables/disables the possibility to kick players via voting.
 - true *[default]*

From d928e33dc577a35b0493a0e97b7ac83354cff8d7 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 14:26:55 +0200
Subject: [PATCH 27/31] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 860ed4b..6224043 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [next]
 
 ### Added
+- Add `VOTE_ENABLE` environment variable for configuring voting.
 - Add `LANGUAGE` environment variable for setting the server's language.
 - Implement the `version` command.
 

From 1887ce7491edb32765137cedb6b4b959d7847c94 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 14:28:34 +0200
Subject: [PATCH 28/31] Remove the Vagrantfile

---
 CHANGELOG.md |  1 +
 Vagrantfile  | 56 ----------------------------------------------------
 install.sh   | 20 -------------------
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 Vagrantfile
 delete mode 100644 install.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6224043..49b84f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Use our own `steamcmd` image as base-image.
 
 ### Removed
+- Remove the Vagrantfile.
 - Remove deprecated console arguments `console` and `backup_logs`.
 
 ## [0.5.0]
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 97d7022..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Version
-Vagrant.require_version '>= 1.8.0'
-
-# Configuration
-Vagrant.configure('2') do |config|
-
-  # Base
-  config.vm.box = 'boxcutter/ubuntu1510'
-  config.vm.box_version = '>= 2.0'
-  config.vm.hostname = 'dsta-server'
-
-  # Ports
-  config.vm.network :forwarded_port, guest: 10999, host: 10999, protocol: 'udp'
-  config.vm.network :forwarded_port, guest: 11000, host: 11000, protocol: 'udp'
-  config.vm.network :forwarded_port, guest: 11001, host: 11001, protocol: 'udp'
-
-  # SSH
-  config.ssh.forward_agent = true
-
-  # VirtualBox
-  config.vm.provider :virtualbox do |provider, config|
-    provider.gui = false
-    provider.name = 'DSTA-Server'
-    provider.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
-    provider.customize ['modifyvm', :id, '--memory', 4096]
-    provider.customize ['modifyvm', :id, '--acpi', 'on']
-    provider.customize ['modifyvm', :id, '--cpus', 2]
-    provider.customize ['modifyvm', :id, '--cpuexecutioncap', '100']
-    provider.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
-    provider.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
-    provider.customize ['modifyvm', :id, '--ioapic', 'on']
-  end
-
-  # VMware
-  [:vmware_workstation, :vmware_fusion].each do |provider|
-    config.vm.provider provider do |provider, config|
-      provider.gui = false
-      provider.vmx['displayName'] = 'DSTA-Server'
-      provider.vmx['guestOS'] = 'ubuntu-64'
-      provider.vmx['numvcpus'] = 2
-      provider.vmx['memsize'] = 4096
-    end
-  end
-
-  # Parallels
-  config.vm.provider :parallels do |provider, config|
-    provider.gui = false
-    provider.name = 'DSTA-Server'
-    provider.cpus = 2
-    provider.memory = 4096
-    provider.optimize_power_consumption = false
-  end
-
-  # Provision
-  config.vm.provision :shell, path: 'install.sh'
-end
diff --git a/install.sh b/install.sh
deleted file mode 100644
index 00289f9..0000000
--- a/install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Update Packages
-apt-get update
-
-# Install Dependencies
-apt-get install -y curl dnsmasq linux-image-extra-$(uname -r)
-sleep 3
-
-# Install Docker Engine
-curl -sSL https://get.docker.com/ | sh
-
-# Install Docker Compose
-curl -sSL https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
-
-# Add the vagrant-user to the Docker group
-usermod -aG docker vagrant

From acbf45f625382362d348f53486fe0a4d3346f037 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 14:29:00 +0200
Subject: [PATCH 29/31] Remove references to the deprecated suite project

---
 README.md     | 3 ---
 docs/setup.md | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/README.md b/README.md
index de51f8d..74ef17b 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,6 @@
 This repository provides a `Dockerfile` for building the DST:A Dedicated Server
 for the online multi-player survival game [*Don't Starve Together*][website].
 
-If you want to set up your own server, have a look at the [DST:A Suite][suite].
-
 ## Features
 - [x] Configuration via ENV variables.
 - [x] World presets including caves.
@@ -57,7 +55,6 @@ Check out our [contribution guide][contribution-guide].
 [docs-configuration]: /docs/configuration.md
 [docs-usage]: /docs/usage.md
 [website]: http://www.dontstarvetogether.com/
-[suite]: https://github.com/dst-academy/suite
 [contribution-guide]: /CONTRIBUTING.md
 [docker-kitematic]: https://kitematic.com/
 [docker-toolbox]: https://www.docker.com/docker-toolbox
diff --git a/docs/setup.md b/docs/setup.md
index bec683d..79fc33c 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -10,11 +10,8 @@ Find a quick step-by-step guide how to setup the dedicated server below.
 3. Configure a [`docker-compose.yml`][compose-file] configuration. *(optional but recommended)*
 4. [Start a container][engine-run] i.e. [launch the service][compose-up].
 
-The [DST:A Suite][suite] provides common Docker Compose configurations.
-
 [engine-setup]: https://docs.docker.com/engine/installation/
 [compose-setup]: https://docs.docker.com/compose/install/
 [engine-run]: https://docs.docker.com/engine/reference/run/
 [compose-up]: https://docs.docker.com/compose/reference/up/
 [compose-file]: https://docs.docker.com/compose/compose-file/
-[suite]: https://github.com/dst-academy/suite/

From 060c4f18be07b10cd101eaec76e2f6c559187560 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 15:00:17 +0200
Subject: [PATCH 30/31] Add the BACKUP_LOG_COUNT variable to enable backup of
 logs

---
 CHANGELOG.md                                          | 1 +
 build/Dockerfile                                      | 3 ++-
 build/script/dontstarve_dedicated_server_nullrenderer | 1 +
 docs/configuration.md                                 | 7 +++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49b84f6..867904e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [next]
 
 ### Added
+- Add `BACKUP_LOG_COUNT` environment variable to configure backups for the log files.
 - Add `VOTE_ENABLE` environment variable for configuring voting.
 - Add `LANGUAGE` environment variable for setting the server's language.
 - Implement the `version` command.
diff --git a/build/Dockerfile b/build/Dockerfile
index 85837eb..7d73b86 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -53,7 +53,8 @@ ENV DESCRIPTION="Powered by DST Academy." \
 	PAUSE_WHEN_EMPTY=true \
 	SHARD_NAME=shard \
 	SHARD_IS_MASTER=false \
-	SHARD_BIND_IP="0.0.0.0"
+	SHARD_BIND_IP="0.0.0.0" \
+	BACKUP_LOG_COUNT=0
 
 # Expose default server port.
 EXPOSE $SERVER_PORT/udp
diff --git a/build/script/dontstarve_dedicated_server_nullrenderer b/build/script/dontstarve_dedicated_server_nullrenderer
index 23d78f3..f19d01e 100755
--- a/build/script/dontstarve_dedicated_server_nullrenderer
+++ b/build/script/dontstarve_dedicated_server_nullrenderer
@@ -14,4 +14,5 @@ exec ./dontstarve_dedicated_server_nullrenderer \
 	-conf_dir "." \
 	-cluster `basename $CLUSTER_PATH` \
 	-shard "$SHARD_NAME" \
+	-backup_log_count "$BACKUP_LOG_COUNT" \
 	"$@" < <({ stdbuf -oL cat $DSTA_HOME/console & stdbuf -oL cat & })
diff --git a/docs/configuration.md b/docs/configuration.md
index 47677ac..98e001f 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -259,4 +259,11 @@ Sets the overrides-configuration for all mods. Basically it's just the content f
 configuration into a separate file and read it into the variable beforehand.
 - *string*
 
+### Other
+Defines some other settings.
+
+**BACKUP_LOG_COUNT**  
+Enables the backup of server logs when rebooting the server.
+- *number* *[default: 0]*
+
 [howto-token]: http://dont-starve-game.wikia.com/wiki/Guides/Don%E2%80%99t_Starve_Together_Dedicated_Servers#Server_Tokens

From e586a69e8702a4fa623638d0e2cdcd05ab43fc26 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Sat, 30 Jul 2016 15:19:52 +0200
Subject: [PATCH 31/31] Update CHANGELOG

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 867904e..603c71f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [next]
 
+## [0.6.0]
+
 ### Added
 - Add `BACKUP_LOG_COUNT` environment variable to configure backups for the log files.
 - Add `VOTE_ENABLE` environment variable for configuring voting.
@@ -93,7 +95,8 @@
 ### Added
 - Initial release.
 
-[next]: https://github.com/dst-academy/server/compare/v0.5.0...HEAD
+[next]: https://github.com/dst-academy/server/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/dst-academy/server/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/dst-academy/server/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/dst-academy/server/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/dst-academy/server/compare/v0.2.0...v0.3.0