From 9bb76f57d55ca5a9e502a34e504a21904d4157a1 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Sun, 18 Jul 2021 17:43:46 -0500
Subject: Tons of updates.

---
 minecraft/server/defaults/main.yaml |  2 ++
 minecraft/server/tasks/main.yaml    | 25 +++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'minecraft')

diff --git a/minecraft/server/defaults/main.yaml b/minecraft/server/defaults/main.yaml
index 330d413..e98b8c7 100644
--- a/minecraft/server/defaults/main.yaml
+++ b/minecraft/server/defaults/main.yaml
@@ -7,6 +7,8 @@ minecraft_motd: "A Minecraft Server"
 minecraft_mem: "2G"
 minecraft_seed: ""
 minecraft_difficulty: "hard"
+minecraft_whitelist: "true"
+minecraft_view_distance: "10"
 
 minecraft_vanilla_hash: "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"
 
diff --git a/minecraft/server/tasks/main.yaml b/minecraft/server/tasks/main.yaml
index e75c0d1..d80b9cf 100644
--- a/minecraft/server/tasks/main.yaml
+++ b/minecraft/server/tasks/main.yaml
@@ -35,21 +35,30 @@
 - name: configure minecraft eula
   become: yes
   copy:
-    src: "{{item}}"
-    dest: "{{minecraft_dir}}/{{item}}"
+    src: "eula.txt"
+    dest: "{{minecraft_dir}}/eula.txt"
     owner: "{{minecraft_user}}"
     group: "{{minecraft_user}}"
-  loop:
-    - "eula.txt"
   notify: restart minecraft
 
 - name: configure minecraft ops
   become: yes
-  template:
-    src: "ops.json.j2"
+  copy:
+    src: "{{minecraft_ops_file}}"
     dest: "{{minecraft_dir}}/ops.json"
     owner: "{{minecraft_user}}"
     group: "{{minecraft_user}}"
+  when: minecraft_ops_file is defined
+  notify: restart minecraft
+
+- name: configure minecraft whitelist
+  become: yes
+  copy:
+    src: "{{minecraft_whitelist_file}}"
+    dest: "{{minecraft_dir}}/whitelist.json"
+    owner: "{{minecraft_user}}"
+    group: "{{minecraft_user}}"
+  when: minecraft_whitelist_file is defined and minecraft_whitelist == "true"
   notify: restart minecraft
 
 - name: create minecraft plugins dir
@@ -87,6 +96,10 @@
     - {key: "motd", value: "{{minecraft_motd}}"}
     - {key: "level-seed", value: "{{minecraft_seed}}"}
     - {key: "difficulty", value: "{{minecraft_difficulty}}"}
+    - {key: "white-list", value: "{{minecraft_whitelist}}"}
+    - {key: "enforce-whitelist", value: "{{minecraft_whitelist}}"}
+    - {key: "view-distance", value: "{{minecraft_view_distance}}"}
+    - {key: "snooper-enabled", value: "false"}
 
 - name: install systemd service
   become: yes
-- 
cgit v1.2.3