Update Minecraft server

Makefile

@@ -25,7 +25,7 @@
 PROJECT_DIRECTORY := infrastructure
 CONFIG_DIRECTORY := presets
 # 7dtd minecraft satisfactory
-CONFIGS := 7dtd
+CONFIGS := minecraft
 #DOCKER_PROFILES := 
 
 include DockerCompose.mk

infrastructure/services/7daystodie-server/docker-compose.yml

@@ -1,7 +1,5 @@
 include:
 # 7 days to die server
   - 7daystodie/docker-compose.7daystodie.yml
-# OpenSSH server
-  - openssh/docker-compose.openssh.yml
 # Backup server
   - backup/docker-compose.backup.yml

infrastructure/services/7daystodie-server/openssh/config/authorized_keys/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com

infrastructure/services/7daystodie-server/openssh/docker-compose.openssh.yml

@@ -1,45 +0,0 @@
-services:
-  # openssh
-  7daystodie_openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: 7daystodie_openssh
-    profiles:
-      - 7daystodie_openssh
-    depends_on:
-      - 7daystodie_server
-    restart: on-failure:5
-    env_file:
-      - ./env/openssh.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-    volumes:
-      - 7daystodie_openssh_config:/config
-      - ./config/authorized_keys:/authorized_ssh_keys:ro
-      - 7daystodie_backup:/7daystodie_backup
-      - 7daystodie_server_save:/7daystodie_server_save
-      - 7daystodie_server_config_lgsm:/7daystodie_server_config_lgsm
-      - 7daystodie_server_file:/7daystodie_server_file
-      - 7daystodie_server_log:/7daystodie_server_log
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:false
-    cap_drop:
-      - SYS_ADMIN
-    ports:
-      - 2222:2222
-
-volumes:
-  7daystodie_openssh_config:
-    name: 7daystodie_openssh_config
-  7daystodie_backup:
-    name: 7daystodie_backup
-  7daystodie_server_save:
-    name: 7daystodie_server_save
-  7daystodie_server_config_lgsm:
-    name: 7daystodie_server_config_lgsm
-  7daystodie_server_file:
-    name: 7daystodie_server_file
-  7daystodie_server_log:
-    name: 7daystodie_server_log

infrastructure/services/7daystodie-server/openssh/env/openssh.env

@@ -1,15 +0,0 @@
-TZ=Etc/UTC
-SUDO_ACCESS=true
-PASSWORD_ACCESS=false
-DOCKER_MODS=linuxserver/mods:openssh-server-rsync
-#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
-PUBLIC_KEY_DIR=/authorized_ssh_keys
-USER_NAME=admin
-USER_PASSWORD=e7rIZrOW7NypN1w10dmig88gK55MIGOv
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#PUBLIC_KEY_URL=https://github.com/username.keys
-#USER_PASSWORD_FILE=/path/to/file
-#LOG_STDOUT=

infrastructure/services/minecraft-server/docker-compose.yml

@@ -1,7 +1,5 @@
 include:
 # Minecraft server
   - minecraft-server/docker-compose.yml
-# OpenSSH server
-  - openssh/docker-compose.openssh.yml
 # Backup server
   - backup/docker-compose.backup.yml

infrastructure/services/minecraft-server/minecraft-server/env/proxy.env

@@ -1,6 +1,6 @@
 TYPE=VELOCITY
-VELOCITY_VERSION=3.4.0-SNAPSHOT
+VELOCITY_VERSION=3.5.0-SNAPSHOT
-VELOCITY_BUILD_ID=559
+VELOCITY_BUILD_ID=593
 #PLUGINS=
 #SPIGET_PLUGINS=
 DEBUG=false

infrastructure/services/minecraft-server/minecraft-server/env/server.env

@@ -12,7 +12,7 @@ ENFORCE_SECURE_PROFILE=false
 # Server jar options
 TYPE=PURPUR
 VERSION=1.21.11
-PURPUR_BUILD=2553
+PURPUR_BUILD=2568
 FORCE_REDOWNLOAD=false
 BUILD_FROM_SOURCE=false
 
@@ -57,7 +57,7 @@ AUTOPAUSE_TIMEOUT_KN=480000
 NETWORK_COMPRESSION_THRESHOLD=-1
 LOG_TIMESTAMP=true
 MAX_TICK_TIME=-1
-# Time (sec) before AFK player was disconect
+# Time (sec) before AFK player was disconnected
 PLAYER_IDLE_TIMEOUT=600
 MAX_PLAYERS=32
 ALLOW_FLIGHT=false

infrastructure/services/minecraft-server/openssh/config/authorized_keys/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com

infrastructure/services/minecraft-server/openssh/docker-compose.openssh.yml

@@ -1,42 +0,0 @@
-services:
-  # openssh
-  minecraft_openssh:
-    image: linuxserver/openssh-server:latest
-    container_name: minecraft_openssh
-    profiles:
-      - minecraft_openssh
-    depends_on:
-      - mc-server
-    restart: on-failure:5
-    env_file:
-      - ./openssh/env/openssh.env
-    environment:
-      - PUID=${PUID:-1000}
-      - PGID=${PGID:-1000}
-    volumes:
-      - minecraft_serve_openssh_config:/config
-      - ./openssh/config/authorized_keys:/authorized_ssh_keys:ro
-      - minecraft_server_data:/minecraft_server_data
-      - minecraft_proxy_data:/minecraft_proxy_data
-      - minecraft_server_backup:/minecraft_server_backup
-      - minecraft_rcon_data:/minecraft_rcon_data
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:false
-    cap_drop:
-      - SYS_ADMIN
-    ports:
-      - 2222:2222
-
-volumes:
-  minecraft_serve_openssh_config:
-    name: minecraft_serve_openssh_config
-  minecraft_server_backup:
-    name: minecraft_server_backup
-  minecraft_server_data:
-    name: minecraft_server_data
-  minecraft_proxy_data:
-    name: minecraft_proxy_data
-  minecraft_rcon_data:
-    name: minecraft_rcon_data

infrastructure/services/minecraft-server/openssh/env/openssh.env

@@ -1,15 +0,0 @@
-TZ=Etc/UTC
-SUDO_ACCESS=true
-PASSWORD_ACCESS=false
-DOCKER_MODS=linuxserver/mods:openssh-server-rsync
-#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
-PUBLIC_KEY_DIR=/authorized_ssh_keys
-USER_NAME=admin
-USER_PASSWORD=mpaZd1CEbZ5nR3ezFKLjb1jMEcoMIdDO
-
-#PUBLIC_KEY=yourpublickey
-#PUBLIC_KEY_FILE=/path/to/file
-#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
-#PUBLIC_KEY_URL=https://github.com/username.keys
-#USER_PASSWORD_FILE=/path/to/file
-#LOG_STDOUT=