From d418e0036131979fac445a7bf3318a61f0cd1c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 12:56:54 -0400 Subject: [PATCH] configs --- .envExample | 9 ++++++- environments.d.ts | 4 +-- shells/bash/manageCsDocker.sh | 6 ++--- src/configs/guildsConfigs.ts | 49 +++++++---------------------------- 4 files changed, 22 insertions(+), 46 deletions(-) diff --git a/.envExample b/.envExample index 8858e0e..b9ba1c9 100644 --- a/.envExample +++ b/.envExample @@ -6,4 +6,11 @@ botToken=####################################################### sentryDsn=####################################################### OPENAI_API_KEY=########################################### DB_CONN_STRING=############## -DB_NAME=############ \ No newline at end of file +DB_NAME=############ + +CS2_PORT_STILL_NO_CAKE=27015 +CS2_TV_PORT_STILL_NO_CAKE=27016 +CS2_RCON_PORT_STILL_NO_CAKE=27017 +CS2_IP_STILL_NO_CAKE=############## +CS2_TV_PASS_STILL_NO_CAKE=############## +CS2_RCON_PASS_STILL_NO_CAKE=############## \ No newline at end of file diff --git a/environments.d.ts b/environments.d.ts index 79054fe..a3ba65e 100644 --- a/environments.d.ts +++ b/environments.d.ts @@ -7,8 +7,8 @@ declare global { botToken: string; guildIds: string; inviteUrl: string; - RCON_PASS_192_168_1_128_27015:string; - RCON_PASS_192_168_1_128_27016:string; + CS2_RCON_PASS_192_168_1_128_27015:string; + CS2_RCON_PASS_192_168_1_128_27016:string; DB_CONN_STRING:string, DB_NAME:string, } diff --git a/shells/bash/manageCsDocker.sh b/shells/bash/manageCsDocker.sh index 01d37c6..09c2243 100755 --- a/shells/bash/manageCsDocker.sh +++ b/shells/bash/manageCsDocker.sh @@ -6,15 +6,15 @@ fi case "$1" in "0") - dockerName="cs2-WeConnected-ns1" + dockerName="CS2-SWT" ;; "1") - dockerName="cs2-WeConnected-ns2" + dockerName="CS2-SWT" ;; *) - dockerName="cs2-WeConnected-ns1" + dockerName="CS2-SWT" ;; esac diff --git a/src/configs/guildsConfigs.ts b/src/configs/guildsConfigs.ts index cbafd9b..802aafe 100644 --- a/src/configs/guildsConfigs.ts +++ b/src/configs/guildsConfigs.ts @@ -30,9 +30,9 @@ export const guildsConfigs = [ getContent: (params: any) => `🤖 Big thanks to <@${params.member.id}> for boosting the server! ⚡👾` }, cs2: { + dockerAccess: ['cs2Admin'], rconChannels: [], chatChannels: [], - dockerAccess: [] }, ollama: { url: "https://api.ctrlaidel.com/api" @@ -58,36 +58,23 @@ export const guildsConfigs = [ getContent: (params: any) => `🤖 Say goodbye to <@${params.member.id}> ! 😢👾` }, cs2: { + dockerAccess: ['cs2Admin'], rconChannels: { "1185347837026914304": { - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], }, - "1185593961541275698": { - dev: true, - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], - region: "US_EAST", - } }, chatChannels: { "1185991869121957938": { - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], - region: "US_EAST", - }, - "1185983351325200444": { - dev: true, - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], } - } + }, } }, { @@ -130,24 +117,6 @@ export const guildsConfigs = [ { // StillNoCake guildId: "1202439418204389417", - cs2: { - rconChannels: { - "1202439558952910871": { - port: 27015, - ip: "ts.stillnocake.com", - password: env["RCON_PASS_STILL_NO_CAKE"], - region: "US_EAST", - } - }, - chatChannels: { - "1202440139083882527": { - port: 27015, - ip: "ts.stillnocake.com", - password: env["RCON_PASS_STILL_NO_CAKE"], - region: "US_EAST", - }, - } - } }, { // Pankunai