Просмотр исходного кода

feat(newserver): Military Conflict: Vietnam

Add support for the Military Conflict: Vietnam dedicated game server.

Supersedes #4594 (original WIP PR from @knoxed — completing the implementation).

Changes:
- Added mcvserver default configuration
- Added mcv to serverlist and all distro CSV files
- Added install_config handler for mcvserver
- Added dependency info for all distros
- Added game icons
- Fixed CI workflow issues

Co-authored-by: Knoxed <1338733+knoxed@users.noreply.github.com>
Daniel Gibbs 1 месяц назад
Родитель
Сommit
5a3c210ab7

+ 1 - 1
.github/workflows/details-check.yml

@@ -21,7 +21,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate matrix with generate-matrix.sh
         run: chmod +x .github/workflows/details-check-generate-matrix.sh; .github/workflows/details-check-generate-matrix.sh

+ 4 - 1
.github/workflows/serverlist-validate.yml

@@ -6,13 +6,16 @@ on:
 permissions:
   contents: read
 
+env:
+  datadir: lgsm/data
+
 jobs:
   serverlist-validate:
     if: github.repository_owner == 'GameServerManagers'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Compare Versions
         run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh

+ 1 - 1
.github/workflows/update-copyright-years-in-license-file.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Action Update License Year

+ 1 - 1
.github/workflows/version-check.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Version Check
         run: chmod +x .github/workflows/version-check.sh; .github/workflows/version-check.sh

+ 189 - 0
lgsm/config-default/config-lgsm/mcvserver/_default.cfg

@@ -0,0 +1,189 @@
+##################################
+######## Default Settings ########
+##################################
+# DO NOT EDIT, ANY CHANGES WILL BE OVERWRITTEN!
+# Copy settings from here and use them in either:
+# common.cfg - applies settings to every instance.
+# [instance].cfg - applies settings to a specific instance.
+
+#### Game Server Settings ####
+
+game_type="0"
+game_mode="0"
+ip="0.0.0.0"
+port="27015"
+clientport="27005"
+sourcetvport="27020"
+steamport="26901"
+defaultmap="mcv_siege"
+maxplayers="32"
+tickrate="64"
+
+## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
+startparameters="-game vietnam -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +game_type ${game_type} +game_mode ${game_mode} -nobreakpad"
+
+#### LinuxGSM Settings ####
+
+## LinuxGSM Stats
+# Send useful stats to LinuxGSM developers.
+# https://docs.linuxgsm.com/configuration/linuxgsm-stats
+# (on|off)
+stats="off"
+
+## Notification Alerts
+# (on|off)
+
+# Display IP | https://docs.linuxgsm.com/alerts#display-ip
+displayip=""
+
+# More info | https://docs.linuxgsm.com/alerts#more-info
+postalert="off"
+
+# Alert on Start/Stop/Restart
+statusalert="off"
+
+# Discord Alerts | https://docs.linuxgsm.com/alerts/discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Email Alerts | https://docs.linuxgsm.com/alerts/email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# Gotify Alerts | https://docs.linuxgsm.com/alerts/gotify
+gotifyalert="off"
+gotifytoken="token"
+gotifywebhook="webhook"
+
+# IFTTT Alerts | https://docs.linuxgsm.com/alerts/ifttt
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://docs.linuxgsm.com/alerts/pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+pushoveruserkey="userkey"
+
+# Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
+rocketchatalert="off"
+rocketchatwebhook="webhook"
+
+# Slack Alerts | https://docs.linuxgsm.com/alerts/slack
+slackalert="off"
+slackwebhook="webhook"
+
+# Telegram Alerts | https://docs.linuxgsm.com/alerts/telegram
+# You can add a custom cURL string eg proxy (useful in Russia) in "curlcustomstring".
+# For example "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help".
+telegramapi="api.telegram.org"
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+curlcustomstring=""
+
+## Updating | https://docs.linuxgsm.com/commands/update
+updateonstart="off"
+
+## Backup | https://docs.linuxgsm.com/commands/backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://docs.linuxgsm.com/features/logging
+consolelogging="on"
+logdays="7"
+
+## Monitor | https://docs.linuxgsm.com/commands/monitor
+# Query delay time
+querydelay="1"
+
+## ANSI Colors | https://docs.linuxgsm.com/features/ansi-colors
+ansi="on"
+
+#### Advanced Settings ####
+
+## Message Display Time | https://docs.linuxgsm.com/features/message-display-time
+sleeptime="0.5"
+
+## SteamCMD Settings | https://docs.linuxgsm.com/steamcmd
+# Server appid
+appid="1136190"
+steamcmdforcewindows="no"
+# SteamCMD Branch | https://docs.linuxgsm.com/steamcmd/branch
+branch=""
+betapassword=""
+# Master Server | https://docs.linuxgsm.com/steamcmd/steam-master-server
+steammaster="false"
+
+## Stop Mode | https://docs.linuxgsm.com/features/stop-mode
+# 1: tmux kill
+# 2: CTRL+c
+# 3: quit
+# 4: quit 120s
+# 5: stop
+# 6: q
+# 7: exit
+# 8: 7 Days to Die
+# 9: GoldSrc
+# 10: Avorion
+# 11: end
+stopmode="3"
+
+## Query mode
+# 1: session only
+# 2: gamedig (gsquery fallback)
+# 3: gamedig
+# 4: gsquery
+# 5: tcp
+querymode="2"
+querytype="protocol-valve"
+
+## Console type
+consoleverbose="yes"
+consoleinteract="yes"
+
+## Game Server Details
+# Do not edit
+gamename="Military Conflict: Vietnam"
+engine="source"
+glibc="2.15"
+
+#### Directories ####
+# Edit with care
+
+## Game Server Directories
+systemdir="${serverfiles}/vietnam"
+executabledir="${serverfiles}"
+executable="./srcds_run_x64"
+servercfgdir="${systemdir}/cfg"
+servercfg="${selfname}.cfg"
+servercfgdefault="server.cfg"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backup"
+
+## Logging Directories
+[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
+gamelogdir="${systemdir}/logs"
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+lgsmlog="${lgsmlogdir}/${selfname}-script.log"
+consolelog="${consolelogdir}/${selfname}-console.log"
+alertlog="${lgsmlogdir}/${selfname}-alert.log"
+postdetailslog="${lgsmlogdir}/${selfname}-postdetails.log"
+
+## Logs Naming
+lgsmlogdate="${lgsmlogdir}/${selfname}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${selfname}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
+
+## Log Parameters
+logtimestamp="off"
+logtimestampformat="%Y-%m-%d %H:%M:%S"

+ 3 - 1
lgsm/data/almalinux-8.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/almalinux-9.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/centos-7.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-11-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/centos-8.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/centos-9.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-17-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-17-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/debian-10.csv

@@ -66,6 +66,7 @@ l4d
 l4d2
 mc,openjdk-11-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/debian-11.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-17-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/debian-12.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-17-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,libssl3:i386,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/debian-13.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-25-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,libssl3:i386,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/debian-9.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-8-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

BIN
lgsm/data/gameicons/mcv-icon.png


BIN
lgsm/data/gameicons/ps-icon.png


BIN
lgsm/data/gameicons/squad44-icon.png


BIN
lgsm/data/gameicons/tf2c-icon.png


+ 3 - 1
lgsm/data/rhel-7.csv

@@ -68,6 +68,7 @@ l4d
 l4d2
 mc,java-11-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-libs,libxml2
@@ -83,7 +84,6 @@ opfor
 pc
 pc2
 pmc,java-11-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pz,java-11-openjdk rng-tools
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/rhel-8.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/rhel-9.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/rocky-8.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/rocky-9.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,java-21-openjdk
 mcb,libnsl
+mcv
 mh
 mohaa,compat-libstdc++-33.i686
 mta,ncurses-compat-libs,libxml2
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,java-21-openjdk
-ps,GConf2
 pvkii
 pvr,libcxx
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2
 stn
 sven
 terraria
 tf
 tf2,libcurl.i686
+tf2c,libcurl.i686
 tfc
 ti
 ts

+ 1 - 0
lgsm/data/serverlist.csv

@@ -66,6 +66,7 @@ l4d,l4dserver,Left 4 Dead,ubuntu-24.04
 l4d2,l4d2server,Left 4 Dead 2,ubuntu-24.04
 mc,mcserver,Minecraft,ubuntu-24.04
 mcb,mcbserver,Minecraft Bedrock,ubuntu-24.04
+mcv,mcvserver,Military Conflict: Vietnam,ubuntu-24.04
 mh,mhserver,MORDHAU,ubuntu-24.04
 mohaa,mohaaserver,Medal of Honor: Allied Assault,ubuntu-24.04
 mta,mtaserver,Multi Theft Auto,ubuntu-24.04

+ 2 - 0
lgsm/data/ubuntu-16.04.csv

@@ -68,6 +68,7 @@ l4d
 l4d2
 mc,openjdk-8-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/ubuntu-18.04.csv

@@ -68,6 +68,7 @@ l4d
 l4d2
 mc,openjdk-11-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/ubuntu-20.04.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-21-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/ubuntu-22.04.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-21-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/ubuntu-23.04.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-21-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 2 - 0
lgsm/data/ubuntu-23.10.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-21-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libncursesw5,libxml2-utils
@@ -115,6 +116,7 @@ sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 3 - 1
lgsm/data/ubuntu-24.04.csv

@@ -67,6 +67,7 @@ l4d
 l4d2
 mc,openjdk-25-jre
 mcb
+mcv
 mh
 mohaa,libstdc++5:i386
 mta,libxml2-utils
@@ -82,7 +83,6 @@ opfor
 pc
 pc2
 pmc,openjdk-21-jre
-ps
 pvkii
 pvr,libc++1
 pw
@@ -109,12 +109,14 @@ sm,telnet,expect
 sof2
 sol
 squad
+squad44
 st,libxml2-utils
 stn
 sven,zlib1g:i386
 terraria
 tf
 tf2,libcurl4-gnutls-dev:i386
+tf2c,libcurl4-gnutls-dev:i386
 tfc
 ti
 ts

+ 5 - 0
lgsm/modules/install_config.sh

@@ -565,6 +565,11 @@ elif [ "${shortname}" == "mcb" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_list_config_locations
+elif [ "${shortname}" == "mcv" ]; then
+	array_configs+=(server.cfg)
+	fn_default_config_remote
+	fn_set_config_vars
+	fn_list_config_locations
 elif [ "${shortname}" == "mohaa" ]; then
 	array_configs+=(server.cfg)
 	fn_default_config_remote