From 756c27f3be85148340f8f4283eb4c291aaa566ea Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 02:23:30 +0100
Subject: [PATCH 01/39] Add some comments to the Dockerfile

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

diff --git a/build/Dockerfile b/build/Dockerfile
index 953ac29..70df3c8 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
 
+# Set environment variables.
 ENV STORAGE_ROOT="/home/steam/.klei/" \
 	CONF_DIR="DoNotStarveTogether" \
 	DEFAULT_SERVER_NAME="Dont Starve Together" \
@@ -30,12 +31,14 @@ ENV STORAGE_ROOT="/home/steam/.klei/" \
 	BIND_IP="0.0.0.0" \
 	DISABLECLOUD=true
 
+# Install dependencies.
 RUN dpkg --add-architecture i386 \
 	&& apt-get update -y \
 	&& apt-get install -y 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
 RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
 	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
@@ -43,16 +46,20 @@ RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/do
 	&& rm /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu
 
+# Add steam user.
 RUN useradd -m steam
 
+# Add entrypoint script.
 COPY /entrypoint.sh /home/steam/
 RUN chmod +x /home/steam/entrypoint.sh
 
+# Install SteamCMD.
 RUN cd /home/steam \
 	&& curl -SLO "http://media.steampowered.com/installer/steamcmd_linux.tar.gz" \
 	&& tar -xvf steamcmd_linux.tar.gz -C /home/steam \
 	&& rm steamcmd_linux.tar.gz
 
+# Install Don't Starve Together Server.
 RUN /home/steam/steamcmd.sh \
 	+@ShutdownOnFailedCommand 1 \
 	+@NoPromptForPassword 1 \

From 6ce5331acd70f366001e63b62e9f0314b0740c1f Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 19:51:35 +0100
Subject: [PATCH 02/39] Update Vagrantfile

---
 Vagrantfile | 31 +++++--------------------------
 install.sh  | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 install.sh

diff --git a/Vagrantfile b/Vagrantfile
index f7afc98..c26869b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,24 +1,3 @@
-$script = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-
-# Update Packages
-apt-get update
-
-# Install Dependencies
-apt-get install -y curl dnsmasq linux-image-extra-$(uname -r)
-sleep 1
-
-# Install Docker Engine
-curl -sSL https://get.docker.com/ | sh
-
-# Install Docker Compose
-curl -sSL https://github.com/docker/compose/releases/download/1.5.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
-SCRIPT
-
 # Version
 Vagrant.require_version '>= 1.8.0'
 
@@ -28,7 +7,7 @@ Vagrant.configure('2') do |config|
   # Base
   config.vm.box = 'bento/ubuntu-15.04'
   config.vm.box_version = '>= 2.2'
-  config.vm.hostname = 'dst-server'
+  config.vm.hostname = 'dsta-server'
 
   # Ports
   config.vm.network :forwarded_port, guest: 10999, host: 10999, protocol: 'udp'
@@ -41,7 +20,7 @@ Vagrant.configure('2') do |config|
   # VirtualBox
   config.vm.provider :virtualbox do |provider, config|
     provider.gui = false
-    provider.name = 'Don\'t Starve Together'
+    provider.name = 'DST:A Server'
     provider.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
     provider.customize ['modifyvm', :id, '--memory', 4096]
     provider.customize ['modifyvm', :id, '--acpi', 'on']
@@ -56,7 +35,7 @@ Vagrant.configure('2') do |config|
   [:vmware_workstation, :vmware_fusion].each do |provider|
     config.vm.provider provider do |provider, config|
       provider.gui = false
-      provider.vmx['displayName'] = 'Don\'t Starve Together'
+      provider.vmx['displayName'] = 'DST:A Server'
       provider.vmx['guestOS'] = 'ubuntu-64'
       provider.vmx['numvcpus'] = 2
       provider.vmx['memsize'] = 4096
@@ -66,12 +45,12 @@ Vagrant.configure('2') do |config|
   # Parallels
   config.vm.provider :parallels do |provider, config|
     provider.gui = false
-    provider.name = 'Don\'t Starve Together'
+    provider.name = 'DST:A Server'
     provider.cpus = 2
     provider.memory = 4096
     provider.optimize_power_consumption = false
   end
 
   # Provision
-  config.vm.provision :shell, inline: $script
+  config.vm.provision :shell, path: 'install.sh'
 end
diff --git a/install.sh b/install.sh
new file mode 100644
index 0000000..78f8f6a
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,20 @@
+#!/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.5.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 ef42d5bb80e0147811d1e84c240289cc215d05ac Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 19:52:15 +0100
Subject: [PATCH 03/39] Add new environment variable to configure
 update-behavior on booting

---
 build/Dockerfile    |  1 +
 build/entrypoint.sh | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 70df3c8..94bd5fe 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -4,6 +4,7 @@ MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
 # Set environment variables.
 ENV STORAGE_ROOT="/home/steam/.klei/" \
 	CONF_DIR="DoNotStarveTogether" \
+	UPDATE_ON_BOOT=true \
 	DEFAULT_SERVER_NAME="Dont Starve Together" \
 	DEFAULT_SERVER_DESCRIPTION="Powered by DST Academy." \
 	SERVER_PORT=10999 \
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 2bd92bc..fee215f 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
 # Update game and mods.
-/home/steam/steamcmd.sh \
-  +@ShutdownOnFailedCommand 1 \
-  +@NoPromptForPassword 1 \
-  +login anonymous \
-  +force_install_dir /home/steam/DoNotStarveTogether \
-  +app_update $STEAM_APP_ID validate \
-  +quit
+if [ "$UPDATE_ON_BOOT" = "true" ]; then
+  /home/steam/steamcmd.sh \
+    +@ShutdownOnFailedCommand 1 \
+    +@NoPromptForPassword 1 \
+    +login anonymous \
+    +force_install_dir /home/steam/DoNotStarveTogether \
+    +app_update $STEAM_APP_ID validate \
+    +quit
+fi
 
 # Create data directory.
 mkdir -p "$STORAGE_ROOT/$CONF_DIR/save/" \

From 5ac84db26bc3ce7fadcb88f54284023422d1d0fd Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 20:11:56 +0100
Subject: [PATCH 04/39] Update README

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76b4cf7..b806e64 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you want to set up your own server, have a look at the [DST:A Suite][suite].
 - [x] Control the server directly on the CLI.
 - [x] World-persistence on container destruction.
 - [ ] Automatic update of the game and mods.
-- [ ] Sharing game and mod-files between instances.
+- [x] Sharing game and mod-files between instances.
 
 ## Setup
 Setting up the server is pretty easy if you got Docker already running.
@@ -131,6 +131,11 @@ Configures the root path of the save directory. Should not be changed under most
 Defines an alternative directory-name for writing and reading server configuration and save-games.
 - *text* *[default: DoNotStarveTogether]*
 
+**UPDATE_ON_BOOT**  
+Enables/disables checking for game and mod updates on boot.
+- true *[default]*
+- false
+
 #### Account
 Sets account-related options.
 

From cfe788d97711b802ffc451126a6d0f83415541a7 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 20:13:21 +0100
Subject: [PATCH 05/39] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1372b13..a72f45f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [next]
 
+### Added
+- Add `UPDATE_ON_BOOT` variable to configure update-behavior on boot.
+
 ## [0.2.0]
 
 ### Added

From a4c7eef967dc931a0479146e9dd675728e45337d Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 21:00:16 +0100
Subject: [PATCH 06/39] Split documentation into multiple files

---
 README.md             | 350 +-----------------------------------------
 docs/configuration.md | 264 +++++++++++++++++++++++++++++++
 docs/setup.md         |  19 +++
 docs/usage.md         |  65 ++++++++
 4 files changed, 355 insertions(+), 343 deletions(-)
 create mode 100644 docs/configuration.md
 create mode 100644 docs/setup.md
 create mode 100644 docs/usage.md

diff --git a/README.md b/README.md
index b806e64..ae2313e 100644
--- a/README.md
+++ b/README.md
@@ -17,340 +17,10 @@ If you want to set up your own server, have a look at the [DST:A Suite][suite].
 - [ ] Automatic update of the game and mods.
 - [x] Sharing game and mod-files between instances.
 
-## Setup
-Setting up the server is pretty easy if you got Docker already running.
-Find a quick step-by-step guide how to setup the dedicated server below.
-
-### Overview
-
-1. Install [Docker Engine][engine-setup].
-2. Install [Docker Compose][compose-setup]. *(optional but recommended)*
-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.
-
-## Usage
-Server-lifecycle is controlled via default [Docker Engine][engine-cli] or [Docker Compose][compose-cli]
-commands. Every time the server is restarted manually it performs an update-task to check if the
-game or installed mods provide updates and will download and install them. Thus it can take some
-minutes before the server shows up on the server-list.
-
-### Basic Commands
-Basic commands to maintain the DST:A Dedicated Server.
-
-**Start the Server**  
-Starts the server. On boot the game-server checks for updates and performs them.  
-Docker Engine:
-`docker run -itd -p 10999:10999/udp --name="dst-server" -e SERVER_TOKEN="server-token" dstacademy/server`  
-Docker Compose:
-`docker-compose up -d`
-
-**Stop the Server**  
-Stops the server.  
-Docker Engine:
-`docker stop dst-server`  
-Docker Compose:
-`docker-compose stop`
-
-**Restart the Server**  
-Restarts the server. On boot the game-server checks for updates and performs them.  
-Docker Engine:
-`docker restart dst-server`  
-Docker Compose:
-`docker-compose restart`
-
-**Remove the Server**  
-Deletes the server.  
-Docker Engine:
-`docker rm -f dst-server`  
-Docker Compose:
-`docker-compose rm -f`
-
-### Advanced Commands
-More advanced commands to maintain the server-image and other stuff.
-
-**Update the Server-Image**  
-Updates the `dstacademy/server` image from the Docker Hub if updates are available.  
-Docker Engine:
-`docker pull dstacademy/server`  
-Docker Compose:
-`docker-compose pull`
-
-**List all created servers/containers**  
-Prints an overview of all available servers.  
-Docker Engine:
-`docker ps -a`  
-Docker Compose:
-`docker-compose ps`
-
-**Attach to the Server**  
-Attaches the terminal to a running server which enables input of server [commands][reference-commands]
-and to observe the server output. To detach without stopping the server press `ctrl+p` followed by `ctrl+q`.  
-Docker Engine:
-`docker attach dst-server`
-
-## Configuration
-Configuration of the server happens through environment variables, which can be passed to
-the `docker run` call via CLI directly or using a separate file. Optionally it's recommended
-to use `docker-compose` instead, which makes it easier to configure all environment variables.
-
-**Example**:
-```sh
-docker run -itd -e SERVER_TOKEN="Token" -e DEFAULT_SERVER_NAME="Name" -e MAX_PLAYERS=10 dstacademy/server
-```
-
-You can chain as many variables as you need. If you want to pass lots of them, it's easier and more
-convenient to create an `.env` file and pass it's path to the command.
-
-**Examples**:
-```sh
-docker run -itd --env-file=".env" dstacademy/server
-```
-
-An `.env` file's contents must look like this and can hold all needed variables:
-```ini
-# This is a comment
-SERVER_TOKEN=Token
-DEFAULT_SERVER_NAME=Name
-MAX_PLAYERS=10
-```
-
-### Environment Variables
-Environment variables can be used to customize certain settings of the server. Most of the
-available environment variables correspond to the `settings.ini` variables used by DST.
-
-#### Application
-Sets application-specific options.
-
-**STORAGE_ROOT**  
-Configures the root path of the save directory. Should not be changed under most circumstances.
-- *text* *[default: /home/steam/.klei/]*
-
-**CONF_DIR**  
-Defines an alternative directory-name for writing and reading server configuration and save-games.
-- *text* *[default: DoNotStarveTogether]*
-
-**UPDATE_ON_BOOT**  
-Enables/disables checking for game and mod updates on boot.
-- true *[default]*
-- false
-
-#### Account
-Sets account-related options.
-
-**SERVER_TOKEN**  *required*  
-Defines the server's token which is needed to run it.
-To [generate a token][howto-token] you need a copy of DST.
-- *text*
-
-#### Network
-Configures network-related settings.
-
-**DEFAULT_SERVER_NAME**  
-Sets the server's name. Shows up on the public server-list and in-game.
-Setting a custom server-name is not required but highly recommended.
-- *text* *[default: Don't Starve Together]*
-
-**DEFAULT_SERVER_DESCRIPTION**  
-Sets the server's description. Shows up on the public server-list and in-game.
-- *text* *[default: Powered by DST-Academy.]*
-
-**SERVER_PORT**  
-Defines the server's public port for players to connect to. Generally it's not needed to change
-the server's port-number, because the external/public port-number can be configured via Docker.
--  *number* *[default: 10999]*
-
-**SERVER_PASSWORD**  
-Defines a server password so only players knowing the password can connect.
-- *text*
-
-**OFFLINE_SERVER**  
-Controls if the server is listed and accessible publicly.
-- 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
-to provide a smooth experience for the configured number of players.
-- *number* *[default: 4]*
-
-**WHITELIST_SLOTS**  
-Reserves player-slots for administrator and/or other players and adds up to the total number of
-players which can connect to the server. The sum of `MAX_PLAYERS` and `WHITELIST_SLOTS` determines
-how many players can connect to the server simultaneously.
-- *number* *[default: 0]*
-
-**PVP**  
-Enables/disables PVP, which basically defines if players can attack each other.
-- true
-- false *[default]*
-
-**GAME_MODE**  
-Defines which game-mode the server runs on.
-- survival *[default]*
-- endless
-- wilderness
-
-**SERVER_INTENTION**  
-Configures the server's gameplay-intention for players.
-- social
-- cooperative *[default]*
-- competitive
-- madness
-
-**ENABLE_AUTOSAVER**  
-Enables/disables automatic saving of the world's state after each ingame-day.
-- true *[default]*
-- false
-
-**TICK_RATE**  
-Sets the servers tick-rate. A higher tick-rate means a smoother
-gameplay but also more bandwidth is needed and more CPU-power is used.
-- 15 *[default]*
-- 30
-- 60
-
-**CONNECTION_TIMEOUT**  
-Defines the time in milliseconds after a non-responding player gets disconnected.
-- *number*  *[default: 5000]*  
-  *Example:* `10000` *(10 seconds)*
-
-**ENABLE_VOTE_KICK**  
-Enables/disables the possibility to kick players via voting.
-- true *[default]*
-- false
-
-**PAUSE_WHEN_EMPTY**  
-Enables/disables pausing of the world when no player is connected.
-- true *[default]*
-- false
-
-**STEAM_APP_ID**  
-Sets the ID of the app to be installed. Generally it's not needed to change this.
-- *number* *[default: 343050]*
-
-**STEAM_AUTHENTICATION_PORT**  
-Sets the authentication port-number for Steam. Generally it's not needed to change this.
-- *number* *[default: 8766]*
-
-**STEAM_MASTER_SERVER_PORT**  
-Sets the master-server port-number for Steam. Generally it's not needed to change this.
-- *number* *[default: 27016]*
-
-**STEAM_GROUP_ID**  
-Relates the server to a corresponding steam-group.
-- *number*
-
-**STEAM_GROUP_ONLY**  
-Enables/disables joining for steam-group members only. Non-group members won't be able to join.
-- true
-- false *[default]*
-
-**STEAM_GROUP_ADMINS**  
-Enables/disables promoting steam-group officers to server administrators.
-- true
-- false *[default]*
-
-#### Misc
-Defines various other configuration options.
-
-**CONSOLE_ENABLED**  
-Disables/enables the ingame-console for administrators.
-- true *[default]*
-- false
-
-**AUTOCOMPILER_ENABLED**  
-- true *[default]*
-- false
-
-**MODS_ENABLED**  
-Enables/disables mod-support.
-- true *[default]*
-- false
-
-#### Shard
-Configures server-sharding.
-
-**SHARD_ENABLE**  
-Enables/disables sharding for connecting multiple servers to one big world.
-- true
-- false *[default]*
-
-**SHARD_NAME**  
-Sets a unique name for this server-shard.
-- *text*
-
-**SHARD_ID**  
-Sets a unique shard ID for this server-shard.
-- *number*  
-  *Example:* `1`
-
-**IS_MASTER**  
-Defines whether this server is the main server.
-- true
-- false *[default]*
-
-**MASTER_IP**  
-Defines the master-server's ip-address for slave-servers.
-- *ip-address*
-
-**MASTER_PORT**  
-Defines the master-server's port. This needs to be set to
-the same port for the master-server and all slave-servers.
-- *port-number*
-
-**BIND_IP**  
-Configures the IP-address for which to allow incoming shard-connections from.
-Generally this should not be changed to work with Docker properly.
-- *ip-address* *[default: 0.0.0.0]*  
-
-**CLUSTER_KEY**  
-Sets a unique and secret cluster key for validating incoming shard-connections.
-This needs to be the same for the master-server and all slave-servers.
-- *text*  
-  *Example:* `secret-and-equal-for-all-shards`
-
-#### Steam
-Sets Steam-related options.
-
-**DISABLECLOUD**  
-Enables/diables the Steam Cloud synchronization.
-- true *[default]*
-- false
-
-#### World
-Defines world-related settings.
-
-**WORLD_PRESET**  
-Defines some pre-configured world settings for the server.
-- SURVIVAL_TOGETHER *[default]*
-- SURVIVAL_TOGETHER_CLASSIC
-- SURVIVAL_DEFAULT_PLUS
-- COMPLETE_DARKNESS
-- DST_CAVE
-
-**WORLD_OVERRIDES**  
-Sets the overrides-configuration for world generation. Basically it's just the content for the
-`worldgenoverride.lua` file. As this value can be pretty large it's recommended to put the
-configuration into a separate file and read it into the variable beforehand. When this is set
-`WORLD_PRESET` has no effect.
-- *string*
-
-#### Mods
-Mods-related settings.
-
-**MODS**  
-Defines mods to install and enable.
-- *CSV of workshop IDs*  
-  *Example:* `378160973,492173795,407705132`
-
-**MODS_OVERRIDES**  
-Sets the overrides-configuration for all mods. Basically it's just the content for the
-`modsoverrides.lua` file. As this value can be pretty large it's recommended to put the
-configuration into a separate file and read it into the variable beforehand.
-- *string*
+## Documentation
+- [Setup][docs-setup]
+- [Configuration][docs-configuration]
+- [Usage][docs-usage]
 
 ## Frequently Asked Questions
 
@@ -372,17 +42,11 @@ configuration into a separate file and read it into the variable beforehand.
 - [Dedicated Server Guide (Wikia)][reference-guide]
 - [Server Console Commands (Wikia)][reference-commands]
 
+[docs-setup]: /docs/setup.md
+[docs-configuration]: /docs/configuration.md
+[docs-usage]: /docs/usage.md
 [website]: http://www.dontstarvetogether.com/
 [suite]: https://github.com/dst-academy/suite
-[image]: https://hub.docker.com/r/dstacademy/server/
-[engine-setup]: https://docs.docker.com/engine/installation/
-[compose-setup]: https://docs.docker.com/compose/install/
-[compose-file]: https://docs.docker.com/compose/compose-file/
-[engine-cli]: https://docs.docker.com/engine/reference/commandline/
-[compose-cli]: https://docs.docker.com/compose/reference/
-[engine-run]: https://docs.docker.com/engine/reference/run/
-[compose-up]: https://docs.docker.com/compose/reference/up/
-[howto-token]: http://dont-starve-game.wikia.com/wiki/Guides/Don%E2%80%99t_Starve_Together_Dedicated_Servers#Server_Tokens
 [docker-kitematic]: https://kitematic.com/
 [docker-toolbox]: https://www.docker.com/docker-toolbox
 [reference-dedicated]: http://forums.kleientertainment.com/forum/83-dont-starve-together-beta-dedicated-server-discussion/
diff --git a/docs/configuration.md b/docs/configuration.md
new file mode 100644
index 0000000..01562c1
--- /dev/null
+++ b/docs/configuration.md
@@ -0,0 +1,264 @@
+# Configuration
+
+Configuration of the server happens through environment variables, which can be passed to
+the `docker run` call via CLI directly or using a separate file. Optionally it's recommended
+to use `docker-compose` instead, which makes it easier to configure all environment variables.
+
+**Example**:
+```sh
+docker run -itd -e SERVER_TOKEN="Token" -e DEFAULT_SERVER_NAME="Name" -e MAX_PLAYERS=10 dstacademy/server
+```
+
+You can chain as many variables as you need. If you want to pass lots of them, it's easier and more
+convenient to create an `.env` file and pass it's path to the command.
+
+**Examples**:
+```sh
+docker run -itd --env-file=".env" dstacademy/server
+```
+
+An `.env` file's contents must look like this and can hold all needed variables:
+```ini
+# This is a comment
+SERVER_TOKEN=Token
+DEFAULT_SERVER_NAME=Name
+MAX_PLAYERS=10
+```
+
+## Environment Variables
+Environment variables can be used to customize certain settings of the server. Most of the
+available environment variables correspond to the `settings.ini` variables used by DST.
+
+### Application
+Sets application-specific options.
+
+**STORAGE_ROOT**  
+Configures the root path of the save directory. Should not be changed under most circumstances.
+- *text* *[default: /home/steam/.klei/]*
+
+**CONF_DIR**  
+Defines an alternative directory-name for writing and reading server configuration and save-games.
+- *text* *[default: DoNotStarveTogether]*
+
+**UPDATE_ON_BOOT**  
+Enables/disables checking for game and mod updates on boot.
+- true *[default]*
+- false
+
+### Account
+Sets account-related options.
+
+**SERVER_TOKEN**  *required*  
+Defines the server's token which is needed to run it.
+To [generate a token][howto-token] you need a copy of DST.
+- *text*
+
+### Network
+Configures network-related settings.
+
+**DEFAULT_SERVER_NAME**  
+Sets the server's name. Shows up on the public server-list and in-game.
+Setting a custom server-name is not required but highly recommended.
+- *text* *[default: Don't Starve Together]*
+
+**DEFAULT_SERVER_DESCRIPTION**  
+Sets the server's description. Shows up on the public server-list and in-game.
+- *text* *[default: Powered by DST-Academy.]*
+
+**SERVER_PORT**  
+Defines the server's public port for players to connect to. Generally it's not needed to change
+the server's port-number, because the external/public port-number can be configured via Docker.
+-  *number* *[default: 10999]*
+
+**SERVER_PASSWORD**  
+Defines a server password so only players knowing the password can connect.
+- *text*
+
+**OFFLINE_SERVER**  
+Controls if the server is listed and accessible publicly.
+- 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
+to provide a smooth experience for the configured number of players.
+- *number* *[default: 4]*
+
+**WHITELIST_SLOTS**  
+Reserves player-slots for administrator and/or other players and adds up to the total number of
+players which can connect to the server. The sum of `MAX_PLAYERS` and `WHITELIST_SLOTS` determines
+how many players can connect to the server simultaneously.
+- *number* *[default: 0]*
+
+**PVP**  
+Enables/disables PVP, which basically defines if players can attack each other.
+- true
+- false *[default]*
+
+**GAME_MODE**  
+Defines which game-mode the server runs on.
+- survival *[default]*
+- endless
+- wilderness
+
+**SERVER_INTENTION**  
+Configures the server's gameplay-intention for players.
+- social
+- cooperative *[default]*
+- competitive
+- madness
+
+**ENABLE_AUTOSAVER**  
+Enables/disables automatic saving of the world's state after each ingame-day.
+- true *[default]*
+- false
+
+**TICK_RATE**  
+Sets the servers tick-rate. A higher tick-rate means a smoother
+gameplay but also more bandwidth is needed and more CPU-power is used.
+- 15 *[default]*
+- 30
+- 60
+
+**CONNECTION_TIMEOUT**  
+Defines the time in milliseconds after a non-responding player gets disconnected.
+- *number*  *[default: 5000]*  
+  *Example:* `10000` *(10 seconds)*
+
+**ENABLE_VOTE_KICK**  
+Enables/disables the possibility to kick players via voting.
+- true *[default]*
+- false
+
+**PAUSE_WHEN_EMPTY**  
+Enables/disables pausing of the world when no player is connected.
+- true *[default]*
+- false
+
+**STEAM_APP_ID**  
+Sets the ID of the app to be installed. Generally it's not needed to change this.
+- *number* *[default: 343050]*
+
+**STEAM_AUTHENTICATION_PORT**  
+Sets the authentication port-number for Steam. Generally it's not needed to change this.
+- *number* *[default: 8766]*
+
+**STEAM_MASTER_SERVER_PORT**  
+Sets the master-server port-number for Steam. Generally it's not needed to change this.
+- *number* *[default: 27016]*
+
+**STEAM_GROUP_ID**  
+Relates the server to a corresponding steam-group.
+- *number*
+
+**STEAM_GROUP_ONLY**  
+Enables/disables joining for steam-group members only. Non-group members won't be able to join.
+- true
+- false *[default]*
+
+**STEAM_GROUP_ADMINS**  
+Enables/disables promoting steam-group officers to server administrators.
+- true
+- false *[default]*
+
+### Misc
+Defines various other configuration options.
+
+**CONSOLE_ENABLED**  
+Disables/enables the ingame-console for administrators.
+- true *[default]*
+- false
+
+**AUTOCOMPILER_ENABLED**  
+- true *[default]*
+- false
+
+**MODS_ENABLED**  
+Enables/disables mod-support.
+- true *[default]*
+- false
+
+### Shard
+Configures server-sharding.
+
+**SHARD_ENABLE**  
+Enables/disables sharding for connecting multiple servers to one big world.
+- true
+- false *[default]*
+
+**SHARD_NAME**  
+Sets a unique name for this server-shard.
+- *text*
+
+**SHARD_ID**  
+Sets a unique shard ID for this server-shard.
+- *number*  
+  *Example:* `1`
+
+**IS_MASTER**  
+Defines whether this server is the main server.
+- true
+- false *[default]*
+
+**MASTER_IP**  
+Defines the master-server's ip-address for slave-servers.
+- *ip-address*
+
+**MASTER_PORT**  
+Defines the master-server's port. This needs to be set to
+the same port for the master-server and all slave-servers.
+- *port-number*
+
+**BIND_IP**  
+Configures the IP-address for which to allow incoming shard-connections from.
+Generally this should not be changed to work with Docker properly.
+- *ip-address* *[default: 0.0.0.0]*  
+
+**CLUSTER_KEY**  
+Sets a unique and secret cluster key for validating incoming shard-connections.
+This needs to be the same for the master-server and all slave-servers.
+- *text*  
+  *Example:* `secret-and-equal-for-all-shards`
+
+### Steam
+Sets Steam-related options.
+
+**DISABLECLOUD**  
+Enables/diables the Steam Cloud synchronization.
+- true *[default]*
+- false
+
+### World
+Defines world-related settings.
+
+**WORLD_PRESET**  
+Defines some pre-configured world settings for the server.
+- SURVIVAL_TOGETHER *[default]*
+- SURVIVAL_TOGETHER_CLASSIC
+- SURVIVAL_DEFAULT_PLUS
+- COMPLETE_DARKNESS
+- DST_CAVE
+
+**WORLD_OVERRIDES**  
+Sets the overrides-configuration for world generation. Basically it's just the content for the
+`worldgenoverride.lua` file. As this value can be pretty large it's recommended to put the
+configuration into a separate file and read it into the variable beforehand. When this is set
+`WORLD_PRESET` has no effect.
+- *string*
+
+### Mods
+Mods-related settings.
+
+**MODS**  
+Defines mods to install and enable.
+- *CSV of workshop IDs*  
+  *Example:* `378160973,492173795,407705132`
+
+**MODS_OVERRIDES**  
+Sets the overrides-configuration for all mods. Basically it's just the content for the
+`modsoverrides.lua` file. As this value can be pretty large it's recommended to put the
+configuration into a separate file and read it into the variable beforehand.
+- *string*
+
+[howto-token]: http://dont-starve-game.wikia.com/wiki/Guides/Don%E2%80%99t_Starve_Together_Dedicated_Servers#Server_Tokens
diff --git a/docs/setup.md b/docs/setup.md
new file mode 100644
index 0000000..8797b0c
--- /dev/null
+++ b/docs/setup.md
@@ -0,0 +1,19 @@
+# Setup
+
+Setting up the server is pretty easy if you got Docker already running.
+Find a quick step-by-step guide how to setup the dedicated server below.
+
+## Overview
+
+1. Install [Docker Engine][engine-setup].
+2. Install [Docker Compose][compose-setup]. *(optional but recommended)*
+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/
diff --git a/docs/usage.md b/docs/usage.md
new file mode 100644
index 0000000..c139c03
--- /dev/null
+++ b/docs/usage.md
@@ -0,0 +1,65 @@
+# Usage
+
+Server-lifecycle is controlled via default [Docker Engine][engine-cli] or [Docker Compose][compose-cli]
+commands. Every time the server is restarted manually it performs an update-task to check if the
+game or installed mods provide updates and will download and install them. Thus it can take some
+minutes before the server shows up on the server-list.
+
+## Basic Commands
+Basic commands to maintain the DST:A Dedicated Server.
+
+**Start the Server**  
+Starts the server. On boot the game-server checks for updates and performs them.  
+Docker Engine:
+`docker run -itd -p 10999:10999/udp --name="dst-server" -e SERVER_TOKEN="server-token" dstacademy/server`  
+Docker Compose:
+`docker-compose up -d`
+
+**Stop the Server**  
+Stops the server.  
+Docker Engine:
+`docker stop dst-server`  
+Docker Compose:
+`docker-compose stop`
+
+**Restart the Server**  
+Restarts the server. On boot the game-server checks for updates and performs them.  
+Docker Engine:
+`docker restart dst-server`  
+Docker Compose:
+`docker-compose restart`
+
+**Remove the Server**  
+Deletes the server.  
+Docker Engine:
+`docker rm -f dst-server`  
+Docker Compose:
+`docker-compose rm -f`
+
+## Advanced Commands
+More advanced commands to maintain the server-image and other stuff.
+
+**Update the Server-Image**  
+Updates the [`dstacademy/server`][image] image from the Docker Hub if updates are available.  
+Docker Engine:
+`docker pull dstacademy/server`  
+Docker Compose:
+`docker-compose pull`
+
+**List all created servers/containers**  
+Prints an overview of all available servers.  
+Docker Engine:
+`docker ps -a`  
+Docker Compose:
+`docker-compose ps`
+
+**Attach to the Server**  
+Attaches the terminal to a running server which enables input of server [commands][reference-commands]
+and to observe the server output. To detach without stopping the server press `ctrl+p` followed by `ctrl+q`.  
+Docker Engine:
+`docker attach dst-server`
+
+[engine-cli]: https://docs.docker.com/engine/reference/commandline/
+[compose-cli]: https://docs.docker.com/compose/reference/
+[reference-commands]: http://dont-starve-game.wikia.com/wiki/Console/Don't_Starve_Together_Commands
+[image]: https://hub.docker.com/r/dstacademy/server/

From 35bae0582297181b60e8e5cf574431cc292535a8 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Mon, 4 Jan 2016 23:45:17 +0100
Subject: [PATCH 07/39] Add Docker-Pull badge to the README

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

diff --git a/README.md b/README.md
index ae2313e..0ee377e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # DST:A Dedicated Server
 > Don't Starve Together Academy Dedicated Server for Docker.
 
+![Docker Pulls](https://img.shields.io/docker/pulls/dstacademy/server.svg)
+
 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 9c96b61b4c358e05c17b34656f56c5208ec0b07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Tue, 5 Jan 2016 14:56:15 +0100
Subject: [PATCH 08/39] Fix the link

---
 docs/setup.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/setup.md b/docs/setup.md
index 8797b0c..bec683d 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -17,3 +17,4 @@ The [DST:A Suite][suite] provides common Docker Compose configurations.
 [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 e6d532d7975df4afb0f3b2822bd9127c7a5e91b3 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Tue, 5 Jan 2016 14:45:07 +0100
Subject: [PATCH 09/39] Add no-install-recommends option to apt-get install
 call

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

diff --git a/build/Dockerfile b/build/Dockerfile
index 94bd5fe..7bb3506 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -35,7 +35,7 @@ ENV STORAGE_ROOT="/home/steam/.klei/" \
 # Install dependencies.
 RUN dpkg --add-architecture i386 \
 	&& apt-get update -y \
-	&& apt-get install -y curl lib32gcc1 lib32stdc++6 libcurl4-gnutls-dev:i386 \
+	&& apt-get install -y --no-install-recommends curl lib32gcc1 lib32stdc++6 libcurl4-gnutls-dev:i386 \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 

From d9eada86a4ae753d44109b766b87c4bd0876f27d Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Tue, 5 Jan 2016 16:27:58 +0100
Subject: [PATCH 10/39] Install certificates to properly install gosu

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

diff --git a/build/Dockerfile b/build/Dockerfile
index 7bb3506..d17b52a 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -35,7 +35,7 @@ ENV STORAGE_ROOT="/home/steam/.klei/" \
 # Install dependencies.
 RUN dpkg --add-architecture i386 \
 	&& apt-get update -y \
-	&& apt-get install -y --no-install-recommends curl lib32gcc1 lib32stdc++6 libcurl4-gnutls-dev:i386 \
+	&& 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/*
 

From 2930add2ce93d0faedc1f3116c0c3d1676a3c576 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Tue, 5 Jan 2016 17:38:42 +0100
Subject: [PATCH 11/39] Use Debian Jessie as base image

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

diff --git a/build/Dockerfile b/build/Dockerfile
index d17b52a..0efa852 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM debian:jessie
 MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
 
 # Set environment variables.

From 4f52f00fde249690d5d6b39f7d3f6422095cf6c8 Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Tue, 5 Jan 2016 19:24:57 +0100
Subject: [PATCH 12/39] Resolves #3 - Create a cool random name if it's not set

---
 build/Dockerfile     |   4 +-
 build/adjectives.txt | 100 +++++++++++++++++++++++++++++++++++++++++++
 build/entrypoint.sh  |  10 +++++
 build/names.txt      |  39 +++++++++++++++++
 4 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 build/adjectives.txt
 create mode 100644 build/names.txt

diff --git a/build/Dockerfile b/build/Dockerfile
index 0efa852..e832a36 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
 ENV STORAGE_ROOT="/home/steam/.klei/" \
 	CONF_DIR="DoNotStarveTogether" \
 	UPDATE_ON_BOOT=true \
-	DEFAULT_SERVER_NAME="Dont Starve Together" \
+	DEFAULT_SERVER_NAME= \
 	DEFAULT_SERVER_DESCRIPTION="Powered by DST Academy." \
 	SERVER_PORT=10999 \
 	OFFLINE_SERVER=false \
@@ -51,7 +51,7 @@ RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/do
 RUN useradd -m steam
 
 # Add entrypoint script.
-COPY /entrypoint.sh /home/steam/
+COPY /entrypoint.sh /adjectives.txt /names.txt /home/steam/
 RUN chmod +x /home/steam/entrypoint.sh
 
 # Install SteamCMD.
diff --git a/build/adjectives.txt b/build/adjectives.txt
new file mode 100644
index 0000000..1aa0dd9
--- /dev/null
+++ b/build/adjectives.txt
@@ -0,0 +1,100 @@
+Adamant
+Adroit
+Amatory
+Animistic
+Antic
+Arcadian
+Baleful
+Bellicose
+Bilious
+Boorish
+Calamitous
+Caustic
+Cerulean
+Comely
+Concomitant
+Contumacious
+Corpulent
+Crapulous
+Defamatory
+Didactic
+Dilatory
+Dowdy
+Efficacious
+Effulgent
+Egregious
+Endemic
+Equanimous
+Execrable
+Fastidious
+Feckless
+Fecund
+Friable
+Fulsome
+Garrulous
+Guileless
+Gustatory
+Heuristic
+Histrionic
+Hubristic
+Incendiary
+Insidious
+Insolent
+Intransigent
+Inveterate
+Invidious
+Irksome
+Jejune
+Jocular
+Judicious
+Lachrymose
+Limpid
+Loquacious
+Luminous
+Mannered
+Mendacious
+Meretricious
+Minatory
+Mordant
+Munificent
+Nefarious
+Noxious
+Obtuse
+Parsimonious
+Pendulous
+Pernicious
+Pervasive
+Petulant
+Platitudinous
+Precipitate
+Propitious
+Puckish
+Querulous
+Quiescent
+Rebarbative
+Recalcitrant
+Redolent
+Rhadamanthine
+Risible
+Ruminative
+Sagacious
+Salubrious
+Sartorial
+Sclerotic
+Serpentine
+Spasmodic
+Strident
+Taciturn
+Tenacious
+Tremulous
+Trenchant
+Turbulent
+Turgid
+Ubiquitous
+Uxorious
+Verdant
+Voluble
+Voracious
+Wheedling
+Withering
+Zealous
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index fee215f..82cda78 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -18,6 +18,16 @@ mkdir -p "$STORAGE_ROOT/$CONF_DIR/save/" \
 # Create the settings.ini file.
 FILE_SETTINGS="$STORAGE_ROOT/$CONF_DIR/settings.ini"
 if [ ! -f $FILE_SETTINGS ]; then
+  if [ -z "$DEFAULT_SERVER_NAME" ]; then
+    selectRandomLine(){
+      mapfile list < $1
+      echo ${list[$RANDOM % ${#list[@]}]}
+    }
+
+    DEFAULT_SERVER_NAME="`selectRandomLine /home/steam/adjectives.txt` `selectRandomLine /home/steam/names.txt`"
+    echo "'$DEFAULT_SERVER_NAME' has been set as the server\'s name."
+  fi
+
 cat <<- EOF > $FILE_SETTINGS
 	[network]
 	default_server_name = $DEFAULT_SERVER_NAME
diff --git a/build/names.txt b/build/names.txt
new file mode 100644
index 0000000..a087de9
--- /dev/null
+++ b/build/names.txt
@@ -0,0 +1,39 @@
+Wilson
+Willow
+Wolfgang
+Wendy
+WX-78
+Wickerbottom
+Woodie
+Werebeaver
+Wes
+Wigfrid
+Webber
+Walani
+Maxwell
+Charlie
+Abigail
+Lucy
+Bernie
+Chester
+Packim Baggims
+Pig King
+Yaarctopus
+Glommer
+Deerclops
+Bearger
+Moose
+Goose
+Dragonfly
+Mosling
+Mandrake
+Beefalo
+Gobbler
+Hound
+Koalefant
+Krampus
+Spider Queen
+Treeguard
+Werepig
+Bunnyman
+MacTusk

From e7ddda6fd13edd43b527a56465f9470b58c88a17 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 02:48:30 +0100
Subject: [PATCH 13/39] Remove obsolete single quotation mark

---
 build/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 82cda78..13cebf8 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -25,7 +25,7 @@ if [ ! -f $FILE_SETTINGS ]; then
     }
 
     DEFAULT_SERVER_NAME="`selectRandomLine /home/steam/adjectives.txt` `selectRandomLine /home/steam/names.txt`"
-    echo "'$DEFAULT_SERVER_NAME' has been set as the server\'s name."
+    echo "'$DEFAULT_SERVER_NAME' has been set as the server's name."
   fi
 
 cat <<- EOF > $FILE_SETTINGS

From 047c91928110568dbe50860eaab991cdca982680 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 02:48:50 +0100
Subject: [PATCH 14/39] Update documentation

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

diff --git a/docs/configuration.md b/docs/configuration.md
index 01562c1..e06fef1 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -59,7 +59,8 @@ Configures network-related settings.
 **DEFAULT_SERVER_NAME**  
 Sets the server's name. Shows up on the public server-list and in-game.
 Setting a custom server-name is not required but highly recommended.
-- *text* *[default: Don't Starve Together]*
+If no name is configured, a random name will be generated.
+- *text* *[default: *RANDOM*]*
 
 **DEFAULT_SERVER_DESCRIPTION**  
 Sets the server's description. Shows up on the public server-list and in-game.

From 57bd1f0e7c1bf346ccd77b79224b5ada68339801 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 03:28:00 +0100
Subject: [PATCH 15/39] Add new configuration variable to define a prefix for
 the server name

---
 build/entrypoint.sh   | 2 +-
 docs/configuration.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 13cebf8..e0a585a 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -30,7 +30,7 @@ if [ ! -f $FILE_SETTINGS ]; then
 
 cat <<- EOF > $FILE_SETTINGS
 	[network]
-	default_server_name = $DEFAULT_SERVER_NAME
+	default_server_name = $SERVER_NAME_PREFIX $DEFAULT_SERVER_NAME
 	default_server_description = $DEFAULT_SERVER_DESCRIPTION
 	server_port = $SERVER_PORT
 	server_password = $SERVER_PASSWORD
diff --git a/docs/configuration.md b/docs/configuration.md
index e06fef1..34ace67 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -66,6 +66,10 @@ If no name is configured, a random name will be generated.
 Sets the server's description. Shows up on the public server-list and in-game.
 - *text* *[default: Powered by DST-Academy.]*
 
+**SERVER_NAME_PREFIX**  
+Defines text to prepend to the server's name.
+- *text*
+
 **SERVER_PORT**  
 Defines the server's public port for players to connect to. Generally it's not needed to change
 the server's port-number, because the external/public port-number can be configured via Docker.

From e99311703bf3537756480fbef19d13f4f640bca3 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 03:28:28 +0100
Subject: [PATCH 16/39] Remove obsolete whitespace in the documentation

---
 docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 34ace67..07269f4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -73,7 +73,7 @@ Defines text to prepend to the server's name.
 **SERVER_PORT**  
 Defines the server's public port for players to connect to. Generally it's not needed to change
 the server's port-number, because the external/public port-number can be configured via Docker.
--  *number* *[default: 10999]*
+- *number* *[default: 10999]*
 
 **SERVER_PASSWORD**  
 Defines a server password so only players knowing the password can connect.

From c341b5d40423cbc1c7b2f2e9e9cefcf2e2c2963f Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 03:34:34 +0100
Subject: [PATCH 17/39] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a72f45f..d835e0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ### Added
 - Add `UPDATE_ON_BOOT` variable to configure update-behavior on boot.
+- Add `SERVER_NAME_PREFIX` variable to configure a prefix for the server's name.
+
+### Changed
+- Generate a random server name if no name was configured.
+- Use the Debian base image instead of Ubuntu.
 
 ## [0.2.0]
 

From 07a9a705694b15bffe976c43163fef964efa2f8e Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 15:48:07 +0100
Subject: [PATCH 18/39] Add Travis configuration file

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..24cad5d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+sudo: required
+
+services:
+  - docker
+
+env:
+  - DOCKER_IMAGE_NAME=dstacademy/server
+
+script:
+  - docker build -t $DOCKER_IMAGE_NAME .

From 31cf72dd4786a7ea4005bb104a79763f3e60cbe7 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 15:58:22 +0100
Subject: [PATCH 19/39] Update Travis configuration

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 24cad5d..566c9df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,9 @@ services:
 env:
   - DOCKER_IMAGE_NAME=dstacademy/server
 
+before_install:
+  - docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD
+
+before_script: cd build
 script:
   - docker build -t $DOCKER_IMAGE_NAME .

From e618ce9b0febaa3fe93f1e4eda6b28e4f1614589 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 16:19:30 +0100
Subject: [PATCH 20/39] Update Travis configuration

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 566c9df..a728660 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: required
+language: generic
 
 services:
   - docker

From a9528ce2f4a33177787c587d9d1547e0f99df568 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 16:19:52 +0100
Subject: [PATCH 21/39] Add build-badge to the README

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

diff --git a/README.md b/README.md
index 0ee377e..b51a128 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # DST:A Dedicated Server
 > Don't Starve Together Academy Dedicated Server for Docker.
 
+[![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)
 
 This repository provides a `Dockerfile` for building the DST:A Dedicated Server

From 6579f17e36a6fc2510b1064cd2ac3c28e48781c7 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 16:21:33 +0100
Subject: [PATCH 22/39] Link docker-pulls badge to the Docker Hub in the README

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

diff --git a/README.md b/README.md
index b51a128..37e6c6f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 > Don't Starve Together Academy Dedicated Server for Docker.
 
 [![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)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dstacademy/server.svg)](https://hub.docker.com/r/dstacademy/server/)
 
 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 f01cde648d125b71c8666e2bab3171331c5adda9 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 16:31:43 +0100
Subject: [PATCH 23/39] Move README badges to the title

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

diff --git a/README.md b/README.md
index 37e6c6f..2e9878c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
-# DST:A Dedicated Server
+# 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/)
 > Don't Starve Together Academy Dedicated Server for Docker.
 
-[![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/)
-
 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 fe90e988ece9126b3acbfc9ba3b556f0df550f73 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 20:19:19 +0100
Subject: [PATCH 24/39] Remove docker login from the Travis configuration

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a728660..610327d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,6 @@ services:
 env:
   - DOCKER_IMAGE_NAME=dstacademy/server
 
-before_install:
-  - docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD
-
 before_script: cd build
 script:
   - docker build -t $DOCKER_IMAGE_NAME .

From d0866db9495c2e5753d716c944bb143dce694b95 Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Wed, 6 Jan 2016 01:30:06 +0100
Subject: [PATCH 25/39] Arrangeing the Docker commands to improve the build
 perfomance

---
 build/Dockerfile    | 67 ++++++++++++++++++++++-----------------------
 build/entrypoint.sh |  2 +-
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index e832a36..e49c59f 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,6 +1,39 @@
 FROM debian:jessie
 MAINTAINER Thomas Deinhamer <thasmo@gmail.com>
 
+# Install dependencies.
+RUN dpkg --add-architecture i386 \
+	&& apt-get update -y \
+	&& 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/*
+
+# Add steam user.
+RUN useradd -m steam
+
+# Install SteamCMD.
+RUN cd /home/steam \
+	&& curl -SLO "http://media.steampowered.com/installer/steamcmd_linux.tar.gz" \
+	&& tar -xvf steamcmd_linux.tar.gz -C /home/steam \
+	&& rm steamcmd_linux.tar.gz
+
+# Install Don't Starve Together Server.
+RUN /home/steam/steamcmd.sh \
+	+@ShutdownOnFailedCommand 1 \
+	+@NoPromptForPassword 1 \
+	+login anonymous \
+	+force_install_dir /home/steam/DoNotStarveTogether \
+	+app_update 343050 validate \
+	+quit
+
+# Install gosu.
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
+RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
+	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
+	&& gpg --verify /usr/local/bin/gosu.asc \
+	&& rm /usr/local/bin/gosu.asc \
+	&& chmod +x /usr/local/bin/gosu
+
 # Set environment variables.
 ENV STORAGE_ROOT="/home/steam/.klei/" \
 	CONF_DIR="DoNotStarveTogether" \
@@ -19,7 +52,6 @@ ENV STORAGE_ROOT="/home/steam/.klei/" \
 	CONNECTION_TIMEOUT=5000 \
 	ENABLE_VOTE_KICK=true \
 	PAUSE_WHEN_EMPTY=true \
-	STEAM_APP_ID=343050 \
 	STEAM_AUTHENTICATION_PORT=8766 \
 	STEAM_MASTER_SERVER_PORT=27016 \
 	STEAM_GROUP_ONLY=false \
@@ -32,43 +64,10 @@ ENV STORAGE_ROOT="/home/steam/.klei/" \
 	BIND_IP="0.0.0.0" \
 	DISABLECLOUD=true
 
-# Install dependencies.
-RUN dpkg --add-architecture i386 \
-	&& apt-get update -y \
-	&& 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
-RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
-	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
-	&& gpg --verify /usr/local/bin/gosu.asc \
-	&& rm /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu
-
-# Add steam user.
-RUN useradd -m steam
-
 # Add entrypoint script.
 COPY /entrypoint.sh /adjectives.txt /names.txt /home/steam/
 RUN chmod +x /home/steam/entrypoint.sh
 
-# Install SteamCMD.
-RUN cd /home/steam \
-	&& curl -SLO "http://media.steampowered.com/installer/steamcmd_linux.tar.gz" \
-	&& tar -xvf steamcmd_linux.tar.gz -C /home/steam \
-	&& rm steamcmd_linux.tar.gz
-
-# Install Don't Starve Together Server.
-RUN /home/steam/steamcmd.sh \
-	+@ShutdownOnFailedCommand 1 \
-	+@NoPromptForPassword 1 \
-	+login anonymous \
-	+force_install_dir /home/steam/DoNotStarveTogether \
-	+app_update ${STEAM_APP_ID} validate \
-	+quit
-
 EXPOSE 10999/udp
 VOLUME ["${STORAGE_ROOT}/${CONF_DIR}/save"]
 
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index e0a585a..9251d0d 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -7,7 +7,7 @@ if [ "$UPDATE_ON_BOOT" = "true" ]; then
     +@NoPromptForPassword 1 \
     +login anonymous \
     +force_install_dir /home/steam/DoNotStarveTogether \
-    +app_update $STEAM_APP_ID validate \
+    +app_update 343050 validate \
     +quit
 fi
 

From 63177e6e24f4caa52543bd32d769d700b51997df Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Wed, 6 Jan 2016 01:59:53 +0100
Subject: [PATCH 26/39] Remove unnecessary environment variables

---
 build/Dockerfile    | 6 ++----
 build/entrypoint.sh | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index e49c59f..7c5a824 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -35,9 +35,7 @@ RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/do
 	&& chmod +x /usr/local/bin/gosu
 
 # Set environment variables.
-ENV STORAGE_ROOT="/home/steam/.klei/" \
-	CONF_DIR="DoNotStarveTogether" \
-	UPDATE_ON_BOOT=true \
+ENV UPDATE_ON_BOOT=true \
 	DEFAULT_SERVER_NAME= \
 	DEFAULT_SERVER_DESCRIPTION="Powered by DST Academy." \
 	SERVER_PORT=10999 \
@@ -69,7 +67,7 @@ COPY /entrypoint.sh /adjectives.txt /names.txt /home/steam/
 RUN chmod +x /home/steam/entrypoint.sh
 
 EXPOSE 10999/udp
-VOLUME ["${STORAGE_ROOT}/${CONF_DIR}/save"]
+VOLUME [/home/steam/.klei/DoNotStarveTogether/save"]
 
 WORKDIR /home/steam/DoNotStarveTogether/data/
 ENTRYPOINT ["/home/steam/entrypoint.sh"]
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 9251d0d..af2e0d8 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+STORAGE_ROOT="/home/steam/.klei/"
+CONF_DIR="DoNotStarveTogether"
+
 # Update game and mods.
 if [ "$UPDATE_ON_BOOT" = "true" ]; then
   /home/steam/steamcmd.sh \

From bde57dc7d75ad468ed4a211e63e6ea86d61c856c Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Wed, 6 Jan 2016 18:07:01 +0100
Subject: [PATCH 27/39] Change the steamcmd dir

---
 build/Dockerfile    | 49 +++++++++++++++++++++------------------------
 build/entrypoint.sh | 16 +++++----------
 build/update_dst.sh |  8 ++++++++
 3 files changed, 36 insertions(+), 37 deletions(-)
 create mode 100755 build/update_dst.sh

diff --git a/build/Dockerfile b/build/Dockerfile
index 7c5a824..7dd5392 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -6,33 +6,30 @@ RUN dpkg --add-architecture i386 \
 	&& apt-get update -y \
 	&& 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/*
+	&& rm -rf /var/lib/apt/lists/* \
+	&& gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+	&& curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
+	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
+	&& gpg --verify /usr/local/bin/gosu.asc \
+	&& rm /usr/local/bin/gosu.asc \
+	&& chmod +x /usr/local/bin/gosu
 
 # Add steam user.
-RUN useradd -m steam
+RUN adduser --home /var/lib/steam --disabled-login --gecos "Steam" steam
 
 # Install SteamCMD.
-RUN cd /home/steam \
-	&& curl -SLO "http://media.steampowered.com/installer/steamcmd_linux.tar.gz" \
-	&& tar -xvf steamcmd_linux.tar.gz -C /home/steam \
-	&& rm steamcmd_linux.tar.gz
+RUN gosu steam mkdir -p /var/lib/steam/steamcmd/ \
+	&& curl -SL "http://media.steampowered.com/installer/steamcmd_linux.tar.gz" | gosu steam tar -xzvC /var/lib/steam/steamcmd \
+	&& chmod 744 /var/lib/steam/steamcmd/steamcmd.sh \
+	&& gosu steam /var/lib/steam/steamcmd/steamcmd.sh \
+		+@ShutdownOnFailedCommand 1 \
+		+quit
 
 # Install Don't Starve Together Server.
-RUN /home/steam/steamcmd.sh \
-	+@ShutdownOnFailedCommand 1 \
-	+@NoPromptForPassword 1 \
-	+login anonymous \
-	+force_install_dir /home/steam/DoNotStarveTogether \
-	+app_update 343050 validate \
-	+quit
-
-# Install gosu.
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
-	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
-	&& gpg --verify /usr/local/bin/gosu.asc \
-	&& rm /usr/local/bin/gosu.asc \
-	&& chmod +x /usr/local/bin/gosu
+COPY /update_dst.sh /var/lib/steam/
+RUN chown steam:steam /var/lib/steam/update_dst.sh \
+	&& sync \
+	&& /var/lib/steam/update_dst.sh
 
 # Set environment variables.
 ENV UPDATE_ON_BOOT=true \
@@ -63,11 +60,11 @@ ENV UPDATE_ON_BOOT=true \
 	DISABLECLOUD=true
 
 # Add entrypoint script.
-COPY /entrypoint.sh /adjectives.txt /names.txt /home/steam/
-RUN chmod +x /home/steam/entrypoint.sh
+COPY /entrypoint.sh /adjectives.txt /names.txt /var/lib/steam/
+RUN chmod +x /var/lib/steam/entrypoint.sh
 
 EXPOSE 10999/udp
-VOLUME [/home/steam/.klei/DoNotStarveTogether/save"]
+VOLUME ["/var/lib/steam/.klei/DoNotStarveTogether/save"]
 
-WORKDIR /home/steam/DoNotStarveTogether/data/
-ENTRYPOINT ["/home/steam/entrypoint.sh"]
+WORKDIR /var/lib/steam/DoNotStarveTogether/bin/
+ENTRYPOINT ["/var/lib/steam/entrypoint.sh"]
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index af2e0d8..854ea77 100644
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -1,17 +1,11 @@
 #!/usr/bin/env bash
 
-STORAGE_ROOT="/home/steam/.klei/"
+STORAGE_ROOT="/var/lib/steam/.klei/"
 CONF_DIR="DoNotStarveTogether"
 
 # Update game and mods.
 if [ "$UPDATE_ON_BOOT" = "true" ]; then
-  /home/steam/steamcmd.sh \
-    +@ShutdownOnFailedCommand 1 \
-    +@NoPromptForPassword 1 \
-    +login anonymous \
-    +force_install_dir /home/steam/DoNotStarveTogether \
-    +app_update 343050 validate \
-    +quit
+  /var/lib/steam/update_dst.sh
 fi
 
 # Create data directory.
@@ -27,7 +21,7 @@ if [ ! -f $FILE_SETTINGS ]; then
       echo ${list[$RANDOM % ${#list[@]}]}
     }
 
-    DEFAULT_SERVER_NAME="`selectRandomLine /home/steam/adjectives.txt` `selectRandomLine /home/steam/names.txt`"
+    DEFAULT_SERVER_NAME="`selectRandomLine /var/lib/steam/adjectives.txt` `selectRandomLine /var/lib/steam/names.txt`"
     echo "'$DEFAULT_SERVER_NAME' has been set as the server's name."
   fi
 
@@ -109,7 +103,7 @@ EOF
 fi
 
 # Install mods.
-FILE_MODS="/home/steam/DoNotStarveTogether/mods/dedicated_server_mods_setup.lua"
+FILE_MODS="/var/lib/steam/DoNotStarveTogether/mods/dedicated_server_mods_setup.lua"
 if [ -n "$MODS" ]; then
 
   > $FILE_MODS
@@ -135,7 +129,7 @@ elif [ -n "$MODS" ] && [ ! -f $FILE_MODS_OVERRIDES ]; then
 fi
 
 # Run the DST executable.
-exec gosu steam /home/steam/DoNotStarveTogether/bin/dontstarve_dedicated_server_nullrenderer \
+exec gosu steam ./dontstarve_dedicated_server_nullrenderer \
   -console \
   -persistent_storage_root "$STORAGE_ROOT" \
   -conf_dir "$CONF_DIR" \
diff --git a/build/update_dst.sh b/build/update_dst.sh
new file mode 100755
index 0000000..417aaa7
--- /dev/null
+++ b/build/update_dst.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+gosu steam /var/lib/steam/steamcmd/steamcmd.sh \
+	+@ShutdownOnFailedCommand 1 \
+	+login anonymous \
+	+force_install_dir /var/lib/steam/DoNotStarveTogether \
+	+app_update 343050 validate \
+	+quit \

From 72798af5cb61dd1f190e4c71e93b94e64436855f Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Wed, 6 Jan 2016 19:12:20 +0100
Subject: [PATCH 28/39] Create dsta user and use his home for dsta files

---
 build/Dockerfile    | 11 +++++++----
 build/entrypoint.sh |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 build/entrypoint.sh

diff --git a/build/Dockerfile b/build/Dockerfile
index 7dd5392..e9746c9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -31,6 +31,9 @@ RUN chown steam:steam /var/lib/steam/update_dst.sh \
 	&& sync \
 	&& /var/lib/steam/update_dst.sh
 
+# Add dsta user.
+RUN adduser --home /var/lib/dsta --disabled-login --gecos "DST Academy" dsta
+
 # Set environment variables.
 ENV UPDATE_ON_BOOT=true \
 	DEFAULT_SERVER_NAME= \
@@ -60,11 +63,11 @@ ENV UPDATE_ON_BOOT=true \
 	DISABLECLOUD=true
 
 # Add entrypoint script.
-COPY /entrypoint.sh /adjectives.txt /names.txt /var/lib/steam/
-RUN chmod +x /var/lib/steam/entrypoint.sh
+COPY /entrypoint.sh /adjectives.txt /names.txt /var/lib/dsta/
+RUN chown dsta:dsta -R /var/lib/dsta/
 
 EXPOSE 10999/udp
-VOLUME ["/var/lib/steam/.klei/DoNotStarveTogether/save"]
+VOLUME ["/var/lib/dsta/server/DoNotStarveTogether/save"]
 
 WORKDIR /var/lib/steam/DoNotStarveTogether/bin/
-ENTRYPOINT ["/var/lib/steam/entrypoint.sh"]
+ENTRYPOINT ["/var/lib/dsta/entrypoint.sh"]
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
old mode 100644
new mode 100755
index 854ea77..f65b77a
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-STORAGE_ROOT="/var/lib/steam/.klei/"
+STORAGE_ROOT="/var/lib/dsta/server"
 CONF_DIR="DoNotStarveTogether"
 
 # Update game and mods.
@@ -10,7 +10,7 @@ fi
 
 # Create data directory.
 mkdir -p "$STORAGE_ROOT/$CONF_DIR/save/" \
-  && chown -R steam:steam "$STORAGE_ROOT/$CONF_DIR/"
+  && chown -R dsta:dsta "$STORAGE_ROOT/"
 
 # Create the settings.ini file.
 FILE_SETTINGS="$STORAGE_ROOT/$CONF_DIR/settings.ini"
@@ -21,7 +21,7 @@ if [ ! -f $FILE_SETTINGS ]; then
       echo ${list[$RANDOM % ${#list[@]}]}
     }
 
-    DEFAULT_SERVER_NAME="`selectRandomLine /var/lib/steam/adjectives.txt` `selectRandomLine /var/lib/steam/names.txt`"
+    DEFAULT_SERVER_NAME="`selectRandomLine /var/lib/dsta/adjectives.txt` `selectRandomLine /var/lib/dsta/names.txt`"
     echo "'$DEFAULT_SERVER_NAME' has been set as the server's name."
   fi
 
@@ -69,6 +69,7 @@ cat <<- EOF > $FILE_SETTINGS
 	[steam]
 	disablecloud = $DISABLECLOUD
 EOF
+chown dsta:dsta $FILE_SETTINGS
 fi
 
 # Create the adminlist.txt file.
@@ -129,7 +130,7 @@ elif [ -n "$MODS" ] && [ ! -f $FILE_MODS_OVERRIDES ]; then
 fi
 
 # Run the DST executable.
-exec gosu steam ./dontstarve_dedicated_server_nullrenderer \
+exec gosu dsta ./dontstarve_dedicated_server_nullrenderer \
   -console \
   -persistent_storage_root "$STORAGE_ROOT" \
   -conf_dir "$CONF_DIR" \

From f8e9380e234f90d7158175944f33a34bf790b40f Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 20:50:53 +0100
Subject: [PATCH 29/39] Update volume path in the docker-compose.yml file

---
 build/docker-compose.dist.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker-compose.dist.yml b/build/docker-compose.dist.yml
index 313accd..00c8d2c 100644
--- a/build/docker-compose.dist.yml
+++ b/build/docker-compose.dist.yml
@@ -6,7 +6,7 @@ world:
   stdin_open: true
   volume_driver: local
   volumes:
-    - world:/home/steam/.klei/DoNotStarveTogether/save/
+    - world:/var/lib/dsta/server/DoNotStarveTogether/save/
   ports:
     - "10999:10999/udp"
   environment:

From f8ec0b256c5a1cb3914103c3ddd79741d11cb69b Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 20:53:47 +0100
Subject: [PATCH 30/39] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d835e0f..a827e02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
 ### Changed
 - Generate a random server name if no name was configured.
 - Use the Debian base image instead of Ubuntu.
+- Relocate Steam and DST files in the image.
+- Create separate users for running Steam and the DST server.
+
+### Removed
+- Remove the `CONF_DIR` environment variable.
+- Remove the `STORAGE_ROOT ` environment variable.
 
 ## [0.2.0]
 

From b3881f238934d156c44fbdcefaee9eb9308c199c Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 20:54:08 +0100
Subject: [PATCH 31/39] Update documentation

---
 docs/configuration.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 07269f4..0eca8e8 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -32,14 +32,6 @@ available environment variables correspond to the `settings.ini` variables used
 ### Application
 Sets application-specific options.
 
-**STORAGE_ROOT**  
-Configures the root path of the save directory. Should not be changed under most circumstances.
-- *text* *[default: /home/steam/.klei/]*
-
-**CONF_DIR**  
-Defines an alternative directory-name for writing and reading server configuration and save-games.
-- *text* *[default: DoNotStarveTogether]*
-
 **UPDATE_ON_BOOT**  
 Enables/disables checking for game and mod updates on boot.
 - true *[default]*

From d79bb7e85a77b30d8d8ba2d875938ad62708bc6d Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 20:54:31 +0100
Subject: [PATCH 32/39] Remove obsolete whitespace in the documentation

---
 docs/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index 0eca8e8..37ab255 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -40,7 +40,7 @@ Enables/disables checking for game and mod updates on boot.
 ### Account
 Sets account-related options.
 
-**SERVER_TOKEN**  *required*  
+**SERVER_TOKEN** *required*  
 Defines the server's token which is needed to run it.
 To [generate a token][howto-token] you need a copy of DST.
 - *text*

From f0d5b3f9c31d7097f72ee4f299c69b0f658756cb Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 21:22:07 +0100
Subject: [PATCH 33/39] Update docker-compose.yml configuration

---
 build/docker-compose.dist.yml | 79 +++++++++++++++++------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/build/docker-compose.dist.yml b/build/docker-compose.dist.yml
index 00c8d2c..ca2d446 100644
--- a/build/docker-compose.dist.yml
+++ b/build/docker-compose.dist.yml
@@ -10,43 +10,42 @@ world:
   ports:
     - "10999:10999/udp"
   environment:
-    - DEFAULT_SERVER_NAME=Don't Starve Together
-    - DEFAULT_SERVER_DESCRIPTION=Powered by DST-Academy.
-    - SERVER_PORT=10999
-    - SERVER_PASSWORD=
-    - OFFLINE_SERVER=false
-    - MAX_PLAYERS=1
-    - WHITELIST_SLOTS=1
-    - PVP=false
-    - GAME_MODE=survival
-    - SERVER_INTENTION=cooperative
-    - ENABLE_AUTOSAVER=true
-    - TICK_RATE=30
-    - CONNECTION_TIMEOUT=30000
-    - ENABLE_VOTE_KICK=true
-    - PAUSE_WHEN_EMPTY=true
-    - STEAM_AUTHENTICATION_PORT=8766
-    - STEAM_MASTER_SERVER_PORT=27016
-    - STEAM_GROUP_ID=
-    - STEAM_GROUP_ONLY=false
-    - STEAM_GROUP_ADMINS=false
-    - SERVER_TOKEN=your-server-token
-    - CONSOLE_ENABLED=true
-    - AUTOCOMPILER_ENABLED=true
-    - MODS_ENABLED=true
-    - SHARD_ENABLE=false
-    - SHARD_NAME=world
-    - SHARD_ID=1
-    - IS_MASTER=true
-    - MASTER_IP=
-    - MASTER_PORT=
-    - BIND_IP=
-    - CLUSTER_KEY=random-secret-key
-    - DISABLECLOUD=true
-    - WORLD_PRESET=
-    - WORLD_OVERRIDES
-    - ADMINLIST=
-    - WHITELIST=
-    - BLOCKLIST=
-    - MODS=
-    - MODS_OVERRIDES
+    - SERVER_TOKEN=server-token
+#    - UPDATE_ON_BOOT=true
+#    - DEFAULT_SERVER_NAME=Server
+#    - DEFAULT_SERVER_DESCRIPTION=Let's play Don't Starve Together together.
+#    - SERVER_NAME_PREFIX=DST Academy's
+#    - SERVER_PORT=10999
+#    - SERVER_PASSWORD=
+#    - OFFLINE_SERVER=false
+#    - MAX_PLAYERS=4
+#    - WHITELIST_SLOTS=0
+#    - PVP=true
+#    - GAME_MODE=survival
+#    - SERVER_INTENTION=cooperative
+#    - ENABLE_AUTOSAVER=true
+#    - TICK_RATE=60
+#    - CONNECTION_TIMEOUT=30000
+#    - ENABLE_VOTE_KICK=true
+#    - PAUSE_WHEN_EMPTY=true
+#    - STEAM_AUTHENTICATION_PORT=8766
+#    - STEAM_MASTER_SERVER_PORT=27016
+#    - STEAM_GROUP_ID=
+#    - STEAM_GROUP_ONLY=true
+#    - STEAM_GROUP_ADMINS=true
+#    - CONSOLE_ENABLED=true
+#    - AUTOCOMPILER_ENABLED=true
+#    - MODS_ENABLED=true
+#    - SHARD_ENABLE=true
+#    - SHARD_NAME=master
+#    - SHARD_ID=1
+#    - IS_MASTER=true
+#    - MASTER_IP=
+#    - MASTER_PORT=
+#    - BIND_IP=0.0.0.0
+#    - CLUSTER_KEY=secret-cluster-key
+#    - DISABLECLOUD=true
+#    - WORLD_PRESET=DST_CAVE
+#    - WORLD_OVERRIDES
+#    - MODS=
+#    - MODS_OVERRIDES

From 1f2a2acaa87b1487e34b3c015d20a0fa13175e15 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 21:22:22 +0100
Subject: [PATCH 34/39] Remove obsolete environment variable from the docs

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

diff --git a/docs/configuration.md b/docs/configuration.md
index 37ab255..19212e4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -133,10 +133,6 @@ Enables/disables pausing of the world when no player is connected.
 - true *[default]*
 - false
 
-**STEAM_APP_ID**  
-Sets the ID of the app to be installed. Generally it's not needed to change this.
-- *number* *[default: 343050]*
-
 **STEAM_AUTHENTICATION_PORT**  
 Sets the authentication port-number for Steam. Generally it's not needed to change this.
 - *number* *[default: 8766]*

From dc5e124d91f566644a9aab1c68e929fc6610adf5 Mon Sep 17 00:00:00 2001
From: Brais Gabin <braisgabin@gmail.com>
Date: Thu, 7 Jan 2016 19:31:31 +0100
Subject: [PATCH 35/39] Fix #7 and Close #16

---
 build/Dockerfile    | 2 +-
 build/entrypoint.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index e9746c9..bfec3ad 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -67,7 +67,7 @@ COPY /entrypoint.sh /adjectives.txt /names.txt /var/lib/dsta/
 RUN chown dsta:dsta -R /var/lib/dsta/
 
 EXPOSE 10999/udp
-VOLUME ["/var/lib/dsta/server/DoNotStarveTogether/save"]
+VOLUME ["/var/lib/dsta/server"]
 
 WORKDIR /var/lib/steam/DoNotStarveTogether/bin/
 ENTRYPOINT ["/var/lib/dsta/entrypoint.sh"]
diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index f65b77a..5ea91b1 100755
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-STORAGE_ROOT="/var/lib/dsta/server"
-CONF_DIR="DoNotStarveTogether"
+STORAGE_ROOT="/var/lib/dsta"
+CONF_DIR="server"
 
 # Update game and mods.
 if [ "$UPDATE_ON_BOOT" = "true" ]; then
@@ -10,7 +10,7 @@ fi
 
 # Create data directory.
 mkdir -p "$STORAGE_ROOT/$CONF_DIR/save/" \
-  && chown -R dsta:dsta "$STORAGE_ROOT/"
+  && chown -R dsta:dsta "$STORAGE_ROOT/$CONF_DIR/"
 
 # Create the settings.ini file.
 FILE_SETTINGS="$STORAGE_ROOT/$CONF_DIR/settings.ini"

From 6a3a76b93d4381be221481ff2fbde203ef10be34 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Wed, 6 Jan 2016 21:24:24 +0100
Subject: [PATCH 36/39] Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a827e02..108c98b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,8 @@
 
 ### Removed
 - Remove the `CONF_DIR` environment variable.
-- Remove the `STORAGE_ROOT ` environment variable.
+- Remove the `STORAGE_ROOT` environment variable.
+- Remove the `STEAM_APP_ID` environment variable.
 
 ## [0.2.0]
 

From 162a26e45ec7e00a7fee15fd47f7143f0d03656e Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 7 Jan 2016 20:07:42 +0100
Subject: [PATCH 37/39] Update volume path in the Docker Compose configuration

---
 build/docker-compose.dist.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker-compose.dist.yml b/build/docker-compose.dist.yml
index ca2d446..1af275b 100644
--- a/build/docker-compose.dist.yml
+++ b/build/docker-compose.dist.yml
@@ -6,7 +6,7 @@ world:
   stdin_open: true
   volume_driver: local
   volumes:
-    - world:/var/lib/dsta/server/DoNotStarveTogether/save/
+    - world:/var/lib/dsta/server/
   ports:
     - "10999:10999/udp"
   environment:

From a7065ece2ab3469eaa1a12990895493e8c8fb7cd Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 7 Jan 2016 20:08:53 +0100
Subject: [PATCH 38/39] Update README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e9878c..c93c7d9 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,8 @@ If you want to set up your own server, have a look at the [DST:A Suite][suite].
 - [x] Connected worlds via sharding.
 - [x] Control the server directly on the CLI.
 - [x] World-persistence on container destruction.
-- [ ] Automatic update of the game and mods.
+- [ ] Automatic update of game files.
+- [ ] Automatic update of mod files.
 - [x] Sharing game and mod-files between instances.
 
 ## Documentation

From 68d863b6406c648c607cdffdb3c468df60072fe5 Mon Sep 17 00:00:00 2001
From: Thomas Deinhamer <thasmo@gmail.com>
Date: Thu, 7 Jan 2016 20:53:43 +0100
Subject: [PATCH 39/39] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108c98b..1439bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [next]
 
+## [0.3.0]
+
 ### Added
 - Add `UPDATE_ON_BOOT` variable to configure update-behavior on boot.
 - Add `SERVER_NAME_PREFIX` variable to configure a prefix for the server's name.
@@ -34,6 +36,7 @@
 ### Added
 - Initial release.
 
-[next]: https://github.com/dst-academy/server/compare/v0.2.0...HEAD
+[next]: https://github.com/dst-academy/server/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/dst-academy/server/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/dst-academy/server/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/dst-academy/server/compare/da19beb5479033b82dd6dc1200bb0cf6724904c3...v0.1.0