Sfoglia il codice sorgente

feat(mumble): remove support for mumble (#4128)

deprecate mumble support as Linux is no longer being supported by the Mumble dev team
Daniel Gibbs 3 anni fa
parent
commit
7eef6330d7

+ 0 - 169
lgsm/config-default/config-lgsm/mumbleserver/_default.cfg

@@ -1,169 +0,0 @@
-##################################
-######## 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 ####
-
-## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-fg -ini ${servercfgfullpath}"
-
-#### 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"
-
-# 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"
-
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="alert@example.com"
-mailgunemail="email@myemail.com"
-
-# 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"
-rocketchattoken=""
-
-# 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"
-
-## 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="2"
-
-## Query mode
-# 1: session only
-# 2: gamedig (gsquery fallback)
-# 3: gamedig
-# 4: gsquery
-# 5: tcp
-querymode="2"
-querytype="mumbleping"
-
-## Console type
-consoleverbose="yes"
-consoleinteract="no"
-
-## Game Server Details
-# Do not edit
-gamename="Mumble"
-engine="null"
-glibc="null"
-
-#### Directories ####
-# Edit with care
-
-## Game Server Directories
-systemdir="${serverfiles}"
-executabledir="${serverfiles}"
-executable="./murmur.x86"
-servercfgdir="${systemdir}"
-servercfg="${selfname}.ini"
-servercfgdefault="murmur.ini"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-
-## Backup Directory
-backupdir="${lgsmdir}/backup"
-
-## Logging Directories
-logdir="${rootdir}/log"
-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"

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

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

@@ -69,7 +69,6 @@ mh
 mohaa,compat-libstdc++-33.i686
 mom
 mta,ncurses-compat-libs
-mumble
 nd
 nec
 nmrih,ncurses-libs.i686

+ 0 - 1
lgsm/data/serverlist.csv

@@ -67,7 +67,6 @@ mh,mhserver,MORDHAU,ubuntu-22.04
 mohaa,mohaaserver,Medal of Honor: Allied Assault,ubuntu-22.04
 mom,momserver,Memories of Mars,ubuntu-22.04
 mta,mtaserver,Multi Theft Auto,ubuntu-22.04
-mumble,mumbleserver,Mumble,ubuntu-22.04
 nd,ndserver,Nuclear Dawn,ubuntu-22.04
 nec,necserver,Necesse,ubuntu-22.04
 nmrih,nmrihserver,No More Room in Hell,ubuntu-22.04

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

+ 0 - 1
lgsm/data/ubuntu-21.04.csv

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

+ 0 - 1
lgsm/data/ubuntu-21.10.csv

@@ -67,7 +67,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

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

@@ -69,7 +69,6 @@ mh
 mohaa,libstdc++5:i386
 mom
 mta,libncursesw5
-mumble
 nd
 nec
 nmrih,libtinfo5:i386

+ 0 - 2
lgsm/functions/command_update.sh

@@ -23,8 +23,6 @@ elif [ "${shortname}" == "mcb" ]; then
 	update_minecraft_bedrock.sh
 elif [ "${shortname}" == "pmc" ] || [ "${shortname}" == "vpmc" ] || [ "${shortname}" == "wmc" ]; then
 	update_papermc.sh
-elif [ "${shortname}" == "mumble" ]; then
-	update_mumble.sh
 elif [ "${shortname}" == "fctr" ]; then
 	update_factorio.sh
 elif [ "${shortname}" == "mta" ]; then

+ 0 - 5
lgsm/functions/core_functions.sh

@@ -655,11 +655,6 @@ update_papermc.sh() {
 	fn_fetch_function
 }
 
-update_mumble.sh() {
-	functionfile="${FUNCNAME[0]}"
-	fn_fetch_function
-}
-
 update_mta.sh() {
 	functionfile="${FUNCNAME[0]}"
 	fn_fetch_function

+ 0 - 21
lgsm/functions/info_game.sh

@@ -1074,25 +1074,6 @@ fn_info_game_mta() {
 
 }
 
-fn_info_game_mumble() {
-	# Config
-	if [ ! -f "${servercfgfullpath}" ]; then
-		port="64738"
-		queryport="${port}"
-		servername="Mumble"
-	else
-		port=$(grep "port" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^;/d' -e 's/port//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-		queryport="${port}"
-		configip=$(grep "host=" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^;/d' -e 's/host=//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
-
-		# Not set
-		port=${port:-"64738"}
-		queryport=${queryport:-"64738"}
-		servername="Mumble Port ${port}"
-		configip=${configip:-"0.0.0.0"}
-	fi
-}
-
 fn_info_game_nec() {
 	# Config
 	if [ ! -f "${servercfgfullpath}" ]; then
@@ -2462,8 +2443,6 @@ elif [ "${shortname}" == "mom" ]; then
 	fn_info_game_mom
 elif [ "${shortname}" == "mta" ]; then
 	fn_info_game_mta
-elif [ "${shortname}" == "mumble" ]; then
-	fn_info_game_mumble
 elif [ "${shortname}" == "nec" ]; then
 	fn_info_game_nec
 elif [ "${shortname}" == "onset" ]; then

+ 1 - 11
lgsm/functions/info_messages.sh

@@ -658,7 +658,7 @@ fn_info_message_ports_edit() {
 
 	startparameterslocation="${red}UNKNOWN${default}"
 	# engines/games that require editing in the config file.
-	local ports_edit_array=("ac" "arma3" "armar" "bo" "bt" "cd" "dst" "eco" "idtech2" "idtech3" "idtech3_ql" "jc2" "jc3" "lwjgl2" "mcb" "mumble" "nec" "pc" "pc2" "prism3d" "pz" "qw" "refractor" "renderware" "rw" "sb" "sdtd" "st" "stn" "ts3" "tw" "terraria" "unreal" "unreal2" "unreal3" "vints" "wurm")
+	local ports_edit_array=("ac" "arma3" "armar" "bo" "bt" "cd" "dst" "eco" "idtech2" "idtech3" "idtech3_ql" "jc2" "jc3" "lwjgl2" "mcb" "nec" "pc" "pc2" "prism3d" "pz" "qw" "refractor" "renderware" "rw" "sb" "sdtd" "st" "stn" "ts3" "tw" "terraria" "unreal" "unreal2" "unreal3" "vints" "wurm")
 	for port_edit in "${ports_edit_array[@]}"; do
 		if [ "${shortname}" == "ut3" ]; then
 			startparameterslocation="${servercfgdir}/UTWeb.ini"
@@ -1171,14 +1171,6 @@ fn_info_message_mta() {
 	} | column -s $'\t' -t
 }
 
-fn_info_message_mumble() {
-	{
-		fn_port "header"
-		fn_port "Voice" port udp
-		fn_port "Query" queryport tcp
-	} | column -s $'\t' -t
-}
-
 fn_info_message_nec() {
 	{
 		fn_port "header"
@@ -1757,8 +1749,6 @@ fn_info_message_select_engine() {
 		fn_info_message_mom
 	elif [ "${shortname}" == "mta" ]; then
 		fn_info_message_mta
-	elif [ "${shortname}" == "mumble" ]; then
-		fn_info_message_mumble
 	elif [ "${shortname}" == "nec" ]; then
 		fn_info_message_nec
 	elif [ "${shortname}" == "onset" ]; then

+ 0 - 6
lgsm/functions/install_config.sh

@@ -629,12 +629,6 @@ elif [ "${shotname}" == "mom" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 	fn_list_config_locations
-elif [ "${shortname}" == "mumble" ]; then
-	gamedirname="Mumble"
-	array_configs+=(murmur.ini)
-	fn_fetch_default_config
-	fn_default_config_remote
-	fn_list_config_locations
 elif [ "${shortname}" == "pvr" ]; then
 	gamedirname="PavlovVR"
 	fn_check_cfgdir

+ 0 - 2
lgsm/functions/install_server_files.sh

@@ -224,8 +224,6 @@ elif [ "${shortname}" == "pmc" ]; then
 	update_papermc.sh
 elif [ "${shortname}" == "wmc" ] || [ "${shortname}" == "vpmc" ]; then
 	update_papermc.sh
-elif [ "${shortname}" == "mumble" ]; then
-	update_mumble.sh
 elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "fctr" ]; then

+ 0 - 143
lgsm/functions/update_mumble.sh

@@ -1,143 +0,0 @@
-#!/bin/bash
-# LinuxGSM update_mumble.sh module
-# Author: Daniel Gibbs
-# Contributors: http://linuxgsm.com/contrib
-# Website: https://linuxgsm.com
-# Description: Handles updating of Mumble servers.
-
-functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
-
-fn_update_mumble_dl() {
-	fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${remotebuild}/murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "" "" "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "norun" "noforce" "nohash"
-	fn_dl_extract "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "${tmpdir}"
-	echo -e "copying to ${serverfiles}...\c"
-	cp -R "${tmpdir}/murmur-static_${mumblearch}-${remotebuild}/"* "${serverfiles}"
-	local exitcode=$?
-	if [ "${exitcode}" == "0" ]; then
-		fn_print_ok_eol_nl
-		fn_script_log_pass "Copying to ${serverfiles}"
-		fn_clear_tmp
-	else
-		fn_print_fail_eol_nl
-		fn_script_log_fatal "Copying to ${serverfiles}"
-		fn_clear_tmp
-		core_exit.sh
-	fi
-}
-
-fn_update_mumble_localbuild() {
-	# Gets local build info.
-	fn_print_dots "Checking local build: ${remotelocation}"
-	# Uses executable to find local build.
-	cd "${executabledir}" || exit
-	if [ -f "${executable}" ]; then
-		localbuild=$(${executable} -version 2>&1 > /dev/null | awk '{print $5}')
-		fn_print_ok "Checking local build: ${remotelocation}"
-		fn_script_log_pass "Checking local build"
-	else
-		localbuild="0"
-		fn_print_error "Checking local build: ${remotelocation}"
-		fn_script_log_error "Checking local build"
-	fi
-}
-
-fn_update_mumble_remotebuild() {
-	# Gets remote build info.
-	remotebuild=$(curl -s "https://api.github.com/repos/mumble-voip/mumble/releases/latest" | grep 'murmur-static_x86.*\.bz2"' | tail -1 | awk -F"/" '{ print $8 }')
-	if [ "${firstcommandname}" != "INSTALL" ]; then
-		fn_print_dots "Checking remote build: ${remotelocation}"
-		# Checks if remotebuild variable has been set.
-		if [ -z "${remotebuild}" ] || [ "${remotebuild}" == "null" ]; then
-			fn_print_fail "Checking remote build: ${remotelocation}"
-			fn_script_log_fatal "Checking remote build"
-			core_exit.sh
-		else
-			fn_print_ok "Checking remote build: ${remotelocation}"
-			fn_script_log_pass "Checking remote build"
-		fi
-	else
-		# Checks if remotebuild variable has been set.
-		if [ -z "${remotebuild}" ] || [ "${remotebuild}" == "null" ]; then
-			fn_print_failure "Unable to get remote build"
-			fn_script_log_fatal "Unable to get remote build"
-			core_exit.sh
-		fi
-	fi
-}
-
-fn_update_mumble_compare() {
-	# Removes dots so if statement can compare version numbers.
-	fn_print_dots "Checking for update: ${remotelocation}"
-	localbuilddigit=$(echo -e "${localbuild}" | tr -cd '[:digit:]')
-	remotebuilddigit=$(echo -e "${remotebuild}" | tr -cd '[:digit:]')
-	if [ "${localbuilddigit}" -ne "${remotebuilddigit}" ] || [ "${forceupdate}" == "1" ]; then
-		fn_print_ok_nl "Checking for update: ${remotelocation}"
-		echo -en "\n"
-		echo -e "Update available"
-		echo -e "* Local build: ${red}${localbuild} ${mumblearch}${default}"
-		echo -e "* Remote build: ${green}${remotebuild} ${mumblearch}${default}"
-		echo -en "\n"
-		fn_script_log_info "Update available"
-		fn_script_log_info "Local build: ${localbuild} ${mumblearch}"
-		fn_script_log_info "Remote build: ${remotebuild} ${mumblearch}"
-		fn_script_log_info "${localbuild} > ${remotebuild}"
-
-		unset updateonstart
-		check_status.sh
-		# If server stopped.
-		if [ "${status}" == "0" ]; then
-			exitbypass=1
-			fn_update_mumble_dl
-			if [ "${requirerestart}" == "1" ]; then
-				exitbypass=1
-				command_start.sh
-				fn_firstcommand_reset
-				exitbypass=1
-				command_stop.sh
-				fn_firstcommand_reset
-			fi
-		# If server started.
-		else
-			fn_print_restart_warning
-			exitbypass=1
-			command_stop.sh
-			fn_firstcommand_reset
-			exitbypass=1
-			fn_update_mumble_dl
-			exitbypass=1
-			command_start.sh
-			fn_firstcommand_reset
-		fi
-		unset exitbypass
-		date +%s > "${lockdir}/lastupdate.lock"
-		alert="update"
-		alert.sh
-	else
-		fn_print_ok_nl "Checking for update: ${remotelocation}"
-		echo -en "\n"
-		echo -e "No update available"
-		echo -e "* Local build: ${green}${localbuild} ${mumblearch}${default}"
-		echo -e "* Remote build: ${green}${remotebuild} ${mumblearch}${default}"
-		echo -en "\n"
-		fn_script_log_info "No update available"
-		fn_script_log_info "Local build: ${localbuild} ${mumblearch}"
-		fn_script_log_info "Remote build: ${remotebuild} ${mumblearch}"
-	fi
-}
-
-# The location where the builds are checked and downloaded.
-remotelocation="mumble.info"
-
-# Game server architecture.
-mumblearch="x86"
-
-if [ "${firstcommandname}" == "INSTALL" ]; then
-	fn_update_mumble_remotebuild
-	fn_update_mumble_dl
-else
-	fn_print_dots "Checking for update: ${remotelocation}"
-	fn_script_log_info "Checking for update: ${remotelocation}"
-	fn_update_mumble_localbuild
-	fn_update_mumble_remotebuild
-	fn_update_mumble_compare
-fi