From 98590d3aae48a6c87df8a106bf537efc20008694 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 26 Mar 2020 10:22:30 -0500
Subject: [PATCH] Sort Minecraft server.properties, add missing file

---
 roles/common/files/motd-news                | 19 ++++++
 roles/minecraft/templates/server.properties | 72 ++++++++++-----------
 2 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 roles/common/files/motd-news

diff --git a/roles/common/files/motd-news b/roles/common/files/motd-news
new file mode 100644
index 0000000..eefe29c
--- /dev/null
+++ b/roles/common/files/motd-news
@@ -0,0 +1,19 @@
+# Enable/disable the dynamic MOTD news service
+# This is a useful way to provide dynamic, informative
+# information pertinent to the users and administrators
+# of the local system
+ENABLED=0
+
+# Configure the source of dynamic MOTD news
+# White space separated list of 0 to many news services
+# For security reasons, these must be https
+# and have a valid certificate
+# Canonical runs a service at motd.ubuntu.com, and you
+# can easily run one too
+URLS="https://motd.ubuntu.com"
+
+# Specify the time in seconds, you're willing to wait for
+# dynamic MOTD news
+# Note that news messages are fetched in the background by
+# a systemd timer, so this should never block boot or login
+WAIT=5
diff --git a/roles/minecraft/templates/server.properties b/roles/minecraft/templates/server.properties
index 49a702e..33d3983 100644
--- a/roles/minecraft/templates/server.properties
+++ b/roles/minecraft/templates/server.properties
@@ -1,40 +1,38 @@
-#Minecraft server properties
-#Fri Aug 23 01:44:29 UTC 2019
-spawn-protection=0
-max-tick-time=60000
-generator-settings={{ mcgensettings }}
-force-gamemode=false
-allow-nether=true
-gamemode={{ mcgamemode }}
-broadcast-console-to-ops=true
-enable-query=false
-player-idle-timeout=0
-difficulty=3
-spawn-monsters=true
-op-permission-level=4
-pvp=true
-snooper-enabled=false
-level-type={{ mcleveltype }}
-hardcore=false
-enable-command-block=true
-max-players=8
-network-compression-threshold=256
-resource-pack-sha1=
-max-world-size=29999984
-server-port={{ mcport }}
-server-ip=
-spawn-npcs=true
+# Minecraft server properties
 allow-flight=true
-level-name=world
-view-distance=12
-resource-pack=
-spawn-animals=true
-white-list=false
-generate-structures=true
-online-mode=true
-max-build-height=256
-level-seed=
-prevent-proxy-connections=false
-use-native-transport=true
+allow-nether=true
+difficulty=3
+enable-command-block=true
+enable-query=false
 enable-rcon=false
+force-gamemode=false
+gamemode={{ mcgamemode }}
+generate-structures=true
+generator-settings={{ mcgensettings }}
+hardcore=false
+level-name=world
+level-seed=
+level-type={{ mcleveltype }}
+max-build-height=256
+max-players=8
+max-tick-time=60000
+max-world-size=29999984
 motd={{ mcmotd }}
+network-compression-threshold=256
+online-mode=true
+op-permission-level=4
+player-idle-timeout=0
+prevent-proxy-connections=false
+pvp=true
+resource-pack=
+resource-pack-sha1=
+server-ip=
+server-port={{ mcport }}
+snooper-enabled=false
+spawn-animals=true
+spawn-monsters=true
+spawn-npcs=true
+spawn-protection=0
+use-native-transport=true
+view-distance=12
+white-list=false