diff --git a/services/haring/games/minecraft/index.ts b/services/haring/games/minecraft/index.ts index 176ca6f..6b0b48a 100644 --- a/services/haring/games/minecraft/index.ts +++ b/services/haring/games/minecraft/index.ts @@ -1,3 +1,2 @@ import "./velocity"; -import "./rcon"; // import "./web"; diff --git a/services/haring/games/minecraft/rcon.ts b/services/haring/games/minecraft/rcon.ts deleted file mode 100644 index a855217..0000000 --- a/services/haring/games/minecraft/rcon.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { getEnv } from "~lib/env"; -import { ContainerService } from "~lib/service/service"; - -export const rconService = new ContainerService("rcon", { - image: "itzg/rcon", - servicePort: 4326, - otherServicePorts: { - "ws.rcon": 4327, - }, - envs: { - RWA_USERNAME: "bas", - RWA_PASSWORD: getEnv("RCON_PASSWORD"), - RWA_ADMIN: true, - RWA_RCON_HOST: "minecraft-akio", - RWA_RCON_PASSWORD: getEnv("RCON_PASSWORD"), - RWA_WEBSOCKET_URL: "ws://ws.rcon.bas.sh", - RWA_WEBSOCKET_URL_SSL: "wss://ws.rcon.bas.sh", - }, -}); diff --git a/services/haring/games/minecraft/servers/akio.ts b/services/haring/games/minecraft/servers/akio.ts index ab756be..312ae5b 100644 --- a/services/haring/games/minecraft/servers/akio.ts +++ b/services/haring/games/minecraft/servers/akio.ts @@ -2,6 +2,23 @@ import { getEnv } from "~lib/env"; import { nvmeMount, mount } from "~lib/service/mounts"; import { ContainerService } from "~lib/service/service"; +export const rconService = new ContainerService("rcon", { + image: "itzg/rcon", + servicePort: 4326, + otherServicePorts: { + "ws.rcon": 4327, + }, + envs: { + RWA_USERNAME: "bas", + RWA_PASSWORD: getEnv("RCON_PASSWORD"), + RWA_ADMIN: true, + RWA_RCON_HOST: "minecraft-akio", + RWA_RCON_PASSWORD: getEnv("RCON_PASSWORD"), + RWA_WEBSOCKET_URL: "ws://ws.rcon.bas.sh", + RWA_WEBSOCKET_URL_SSL: "wss://ws.rcon.bas.sh", + }, +}); + export const minecraftAkioService = new ContainerService( "minecraft-akio", { diff --git a/services/haring/index.ts b/services/haring/index.ts index 6b8f236..184b8bf 100644 --- a/services/haring/index.ts +++ b/services/haring/index.ts @@ -72,9 +72,8 @@ export * from "./communication/thelounge"; // export * from "./games/blockheads"; // export * from "./games/hytale"; // export * from "./games/terraria"; -export * from "./games/minecraft/servers/akio"; +// export * from "./games/minecraft/servers/akio"; export * from "./games/minecraft/servers/rengoku"; -export * from "./games/minecraft/rcon"; export * from "./remote/czkawka"; export * from "./remote/mkvtoolnix";