@minecraft-docker/mcctl 2.1.3 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minecraft-docker/mcctl",
-  "version": "2.1.3",
+  "version": "2.3.0",
   "description": "CLI tool for managing Docker Minecraft servers with mc-router",
   "type": "module",
   "bin": {
@@ -55,8 +55,8 @@
   ],
   "dependencies": {
     "@clack/prompts": "^0.8.0",
-    "@minecraft-docker/mod-source-modrinth": "^2.1.3",
-    "@minecraft-docker/shared": "^2.1.3",
+    "@minecraft-docker/mod-source-modrinth": "^2.3.0",
+    "@minecraft-docker/shared": "^2.3.0",
     "better-sqlite3": "^12.6.2",
     "commander": "^12.0.0",
     "js-yaml": "^4.1.0",

package/scripts/create-server.sh

@@ -21,8 +21,12 @@
 #   --modpack SLUG       Modpack slug (required for MODRINTH/AUTO_CURSEFORGE)
 #   --modpack-version VER  Modpack version (optional)
 #   --mod-loader LOADER  Mod loader: fabric, forge, neoforge, quilt (optional)
+#   --no-whitelist       Disable whitelist (whitelist is enabled by default)
+#   --whitelist PLAYERS  Initial whitelist players (comma-separated)
 #   --no-start           Don't start the server after creation
 #   --start              Start the server after creation (default)
+#   --playit-domain DOMAIN  Register playit.gg external domain (e.g., aa.example.com)
+#   --no-playit-domain   Skip playit domain registration (explicit)
 #
 # World options are mutually exclusive (only one can be specified).
 #
@@ -33,6 +37,7 @@
 #   ./scripts/create-server.sh myserver --seed 12345 --no-start
 #   ./scripts/create-server.sh myserver --world-url https://example.com/world.zip
 #   ./scripts/create-server.sh myserver --world existing-world --version 1.21.1
+#   ./scripts/create-server.sh myserver --playit-domain aa.example.com
 # =============================================================================
 
 set -e
@@ -154,6 +159,11 @@ build_hostnames() {
         done
     fi
 
+    # Add playit domain if set
+    if [ -n "${PLAYIT_DOMAIN:-}" ]; then
+        hostnames="$hostnames,$PLAYIT_DOMAIN"
+    fi
+
     echo "$hostnames"
 }
 
@@ -229,7 +239,11 @@ WORLD_NAME=""
 MODPACK_SLUG=""
 MODPACK_VERSION=""
 MOD_LOADER=""
+ENABLE_WHITELIST="true"
+WHITELIST_PLAYERS=""
 START_SERVER="true"
+PLAYIT_DOMAIN=""
+NO_PLAYIT_DOMAIN="false"
 
 # Show usage
 show_usage() {
@@ -247,8 +261,12 @@ show_usage() {
     echo "  --modpack SLUG       Modpack slug (required for MODRINTH/AUTO_CURSEFORGE)"
     echo "  --modpack-version VER  Modpack version (optional)"
     echo "  --mod-loader LOADER  Mod loader: fabric, forge, neoforge, quilt (optional)"
+    echo "  --no-whitelist       Disable whitelist (whitelist is enabled by default)"
+    echo "  --whitelist PLAYERS  Initial whitelist players (comma-separated)"
     echo "  --no-start           Don't start the server after creation"
     echo "  --start              Start the server after creation (default)"
+    echo "  --playit-domain DOMAIN  Register playit.gg external domain (e.g., aa.example.com)"
+    echo "  --no-playit-domain   Skip playit domain registration (explicit)"
     echo ""
     echo "World options (--seed, --world-url, --world) are mutually exclusive."
     echo ""
@@ -260,6 +278,7 @@ show_usage() {
     echo "  $0 myserver --world-url https://example.com/world.zip"
     echo "  $0 myserver --world existing-world -v 1.21.1 --no-start"
     echo "  $0 myserver -t MODRINTH --modpack fabric-example --modpack-version 1.0.0"
+    echo "  $0 myserver --playit-domain aa.example.com"
 }
 
 # Check if first argument exists
@@ -309,6 +328,14 @@ while [[ $# -gt 0 ]]; do
             MOD_LOADER="$2"
             shift 2
             ;;
+        --no-whitelist)
+            ENABLE_WHITELIST="false"
+            shift
+            ;;
+        --whitelist)
+            WHITELIST_PLAYERS="$2"
+            shift 2
+            ;;
         --no-start)
             START_SERVER="false"
             shift
@@ -317,6 +344,14 @@ while [[ $# -gt 0 ]]; do
             START_SERVER="true"
             shift
             ;;
+        --playit-domain)
+            PLAYIT_DOMAIN="$2"
+            shift 2
+            ;;
+        --no-playit-domain)
+            NO_PLAYIT_DOMAIN="true"
+            shift
+            ;;
         -h|--help)
             show_usage
             exit 0
@@ -501,6 +536,27 @@ if [ -f "$CONFIG_FILE" ]; then
             fi
         fi
     fi
+
+    # Apply whitelist settings (enabled by default for security)
+    if [ "$ENABLE_WHITELIST" = "true" ]; then
+        echo "" >> "$CONFIG_FILE"
+        echo "# Whitelist (Secure by Default)" >> "$CONFIG_FILE"
+        echo "ENABLE_WHITELIST=TRUE" >> "$CONFIG_FILE"
+        if [ -n "$WHITELIST_PLAYERS" ]; then
+            echo "WHITELIST=$WHITELIST_PLAYERS" >> "$CONFIG_FILE"
+            echo "   Whitelist: enabled (players: $WHITELIST_PLAYERS)"
+        else
+            echo "   Whitelist: enabled (no initial players)"
+        fi
+    fi
+
+    # Apply playit.gg domain if provided
+    if [ -n "$PLAYIT_DOMAIN" ]; then
+        echo "" >> "$CONFIG_FILE"
+        echo "# playit.gg External Domain" >> "$CONFIG_FILE"
+        echo "PLAYIT_DOMAIN=$PLAYIT_DOMAIN" >> "$CONFIG_FILE"
+        echo "   playit.gg domain: $PLAYIT_DOMAIN"
+    fi
 fi
 
 # Create data and logs directories
@@ -598,6 +654,17 @@ if [ -n "$WORLD_SEED" ]; then
 fi
 echo ""
 
+echo -e "${GREEN}Security:${NC}"
+if [ "$ENABLE_WHITELIST" = "true" ]; then
+    echo "  - Whitelist: enabled"
+    if [ -n "$WHITELIST_PLAYERS" ]; then
+        echo "  - Players: $WHITELIST_PLAYERS"
+    fi
+else
+    echo "  - Whitelist: disabled"
+fi
+echo ""
+
 echo -e "${GREEN}Server details:${NC}"
 echo "  - Directory: servers/$SERVER_NAME/"
 echo "  - Service: mc-$SERVER_NAME"

package/templates/servers/_template/config.env

@@ -88,10 +88,15 @@ MOTD=Welcome! Your adventure begins here.
 # - none: Don't download dependencies (manual management)
 MODRINTH_DOWNLOAD_DEPENDENCIES=required
 
+# -----------------------------------------------------------------------------
+# Whitelist (Secure by Default)
+# -----------------------------------------------------------------------------
+ENABLE_WHITELIST=TRUE
+# WHITELIST=player1,player2
+# OPS=admin1,admin2
+
 # -----------------------------------------------------------------------------
 # Optional: Advanced
 # -----------------------------------------------------------------------------
 # USE_AIKAR_FLAGS=true
 # ICON=https://example.com/icon.png
-# WHITELIST=player1,player2
-# OPS=admin1,admin2