From 5d8b99c4549f9680dbd48dfba443a0872efb7dc5 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 11 Aug 2024 09:40:00 -0500
Subject: [PATCH] Default EXISTING_OPS_FILE and EXISTING_WHITELIST_FILE to
 MERGE (#3038)

---
 docs/configuration/server-properties.md | 8 ++++----
 scripts/start-setupRbac                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/configuration/server-properties.md b/docs/configuration/server-properties.md
index 1f2594c6..61c34f53 100644
--- a/docs/configuration/server-properties.md
+++ b/docs/configuration/server-properties.md
@@ -128,13 +128,13 @@ When either is set, [whitelisting of connecting users](https://minecraft.wiki/w/
 
 To change the behavior when the whitelist file already exists, set the variable `EXISTING_WHITELIST_FILE` to one of the following options:
 
-`SKIP` (default)
+`SKIP`
 : Skip processing of the whitelist file when one is already present. This is the same as setting the legacy variable `OVERRIDE_WHITELIST` to "false".
 
 `SYNCHRONIZE`
 : Synchronize the list of users in the file with the `WHITELIST` or `WHITELIST_FILE` provided. When using both, `WHITELIST` will take precedence. This is the same as setting the legacy variable `OVERRIDE_WHITELIST` to "true".
 
-`MERGE`
+`MERGE` (default)
 : Merge the list of users from `WHITELIST` into the existing file. `WHITELIST_FILE` cannot be used with this option.
 
 `SYNC_FILE_MERGE_LIST`
@@ -171,13 +171,13 @@ Similar to the whitelist, users can be provisioned as operators (aka administrat
 
 To change the behavior when the ops file already exists, set the variable `EXISTING_OPS_FILE` to one of the following options:
 
-`SKIP` (default)
+`SKIP`
 : Skip processing of the ops file when one is already present. This is the same as setting the legacy variable `OVERRIDE_OPS` to "false".
 
 `SYNCHRONIZE`
 : Synchronize the list of users in the file with the `OPS` or `OPS_FILE` provided. When using both, `OPS` will take precedence. The `level` and `bypassesPlayerLimit` will be retained from previous entries. This is the same as setting the legacy variable `OVERRIDE_OPS` to "true".
 
-`MERGE`
+`MERGE` (default)
 : Merge the list of users from `OPS` into the existing file. `OPS_FILE` cannot be used with this option.
 
 `SYNC_FILE_MERGE_LIST`
diff --git a/scripts/start-setupRbac b/scripts/start-setupRbac
index 879f8481..9c69bc7d 100644
--- a/scripts/start-setupRbac
+++ b/scripts/start-setupRbac
@@ -2,8 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-: "${EXISTING_OPS_FILE:=SKIP}"
-: "${EXISTING_WHITELIST_FILE:=SKIP}"
+: "${EXISTING_OPS_FILE:=MERGE}"
+: "${EXISTING_WHITELIST_FILE:=MERGE}"
 
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"