gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into develop

pull/3059/head
Daniel Gibbs 5 years ago
parent
5864379881 7380bb99c2
commit
35c1ba80d4
18 changed files with 78 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      lgsm/functions/alert_discord.sh
  2. 2
      lgsm/functions/alert_rocketchat.sh
  3. 103
      lgsm/functions/alert_slack.sh
  4. 8
      lgsm/functions/check_ip.sh
  5. 4
      lgsm/functions/command_postdetails.sh
  6. 2
      lgsm/functions/command_update.sh
  7. 0
      lgsm/functions/command_update_functions.sh
  8. 2
      lgsm/functions/core_functions.sh
  9. 2
      lgsm/functions/fix_squad.sh
  10. 2
      lgsm/functions/info_config.sh
  11. 4
      lgsm/functions/info_distro.sh
  12. 4
      lgsm/functions/mods_list.sh
  13. 2
      linuxgsm.sh
  14. 11
      tests/tests_defaultcfg/defaultcfg_0.txt
  15. 2
      tests/tests_fctrserver.sh
  16. 2
      tests/tests_jc2server.sh
  17. 2
      tests/tests_mcserver.sh
  18. 2
      tests/tests_ts3server.sh

3
lgsm/functions/alert_discord.sh
View File

@ -21,7 +21,8 @@ json=$(cat <<EOF
"color": "2067276", "color": "2067276",
"author": { "author": {
"name": "${alertemoji} ${alertsubject} ${alertemoji}", "name": "${alertemoji} ${alertsubject} ${alertemoji}",
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"}, "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"
},
"title": "${servername}", "title": "${servername}",
"description": "${alertbody} \n More info: ${alerturl}", "description": "${alertbody} \n More info: ${alerturl}",
"url": "", "url": "",

2
lgsm/functions/alert_rocketchat.sh
View File

@ -48,6 +48,6 @@ if [ -n "${rocketchatsend}" ]; then
fn_print_ok_nl "Sending Rocketchat alert" fn_print_ok_nl "Sending Rocketchat alert"
fn_script_log_pass "Sending Rocketchat alert" fn_script_log_pass "Sending Rocketchat alert"
else else
fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}" fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}"
fn_script_log_fatal "Sending Rocketchat alert: ${rocketchatsend}" fn_script_log_fatal "Sending Rocketchat alert: ${rocketchatsend}"
fi fi

103
lgsm/functions/alert_slack.sh
View File

@ -13,59 +13,54 @@ fi
json=$(cat <<EOF json=$(cat <<EOF
{ {
"attachments": [ "attachments": [
{ {
"blocks": [ "color": "#36a64f",
{ "blocks": [
"type": "section", {
"text": { "type": "section",
"type": "mrkdwn", "text": {
"text": "*${alertemoji} ${alertsubject} ${alertemoji}*" "type": "mrkdwn",
} "text": "*LinuxGSM Alert*"
}, }
{ },
"type": "section", {
"text": { "type": "section",
"type": "mrkdwn", "text": {
"text": "*${servername}*" "type": "mrkdwn",
} "text": "*${alertemoji} ${alertsubject}* \n ${alertbody}"
}, }
{ },
"type": "section", {
"text": { "type": "divider"
"type": "mrkdwn", },
"text": "${alertbody} \n More info: ${alerturl}" {
} "type": "section",
}, "fields": [
{ {
"type": "divider" "type": "mrkdwn",
}, "text": "*Game:* \n ${gamename}"
{ },
"type": "section", {
"fields": [ "type": "mrkdwn",
{ "text": "*Server IP:* \n ${alertip}:${port}"
"type": "mrkdwn", },
"text": "*Game:* \n ${gamename}" {
}, "type": "mrkdwn",
{ "text": "*Server Name:* \n ${servername}"
"type": "mrkdwn", }
"text": "*Server IP:* \n ${alertip}:${port}" ]
} },
] {
}, "type": "section",
{ "text": {
"type": "divider" "type": "mrkdwn",
}, "text": "Hostname: ${HOSTNAME} / More info: ${alerturl}"
{ }
"type": "section", }
"text": { ]
"type": "mrkdwn", }
"text": "*Hostname:* ${HOSTNAME}" ]
}
}
]
}
]
} }
EOF EOF
) )
@ -78,6 +73,6 @@ if [ "${slacksend}" == "ok" ]; then
fn_print_ok_nl "Sending Slack alert" fn_print_ok_nl "Sending Slack alert"
fn_script_log_pass "Sending Slack alert" fn_script_log_pass "Sending Slack alert"
else else
fn_print_fail_nl "Sending Slack alert: ${slacksend}" fn_print_fail_nl "Sending Slack alert: ${slacksend}"
fn_script_log_fatal "Sending Slack alert: ${slacksend}" fn_script_log_fatal "Sending Slack alert: ${slacksend}"
fi fi

8
lgsm/functions/check_ip.sh
View File

@ -27,10 +27,10 @@ if [ -n "${ip}" ]&&[ "${ip}" != "0.0.0.0" ]; then
telnetip=( "${ip}" ) telnetip=( "${ip}" )
# If game config does have an IP set. # If game config does have an IP set.
elif [ -n "${configip}" ]&&[ "${configip}" != "0.0.0.0" ];then elif [ -n "${configip}" ]&&[ "${configip}" != "0.0.0.0" ];then
queryips=( "${configip}" ) queryips=( "${configip}" )
ip="${configip}" ip="${configip}"
webadminip=( "${configip}" ) webadminip=( "${configip}" )
telnetip=( "${configip}" ) telnetip=( "${configip}" )
# If there is only 1 server IP address. # If there is only 1 server IP address.
# Some IP details can automaticly use the one IP # Some IP details can automaticly use the one IP
elif [ "${getipwc}" == "1" ]; then elif [ "${getipwc}" == "1" ]; then

4
lgsm/functions/command_postdetails.sh
View File

@ -67,14 +67,14 @@ fn_print_ok_nl "termbin.com for 30D"
fn_script_log_pass "termbin.com for 30D" fn_script_log_pass "termbin.com for 30D"
pdurl="${link}" pdurl="${link}"
if [ ${firstcommandname} == "POST-DETAILS" ]; then if [ "${firstcommandname}" == "POST-DETAILS" ]; then
echo -e "" echo -e ""
echo -e "Please share the following url for support: " echo -e "Please share the following url for support: "
echo -e "${pdurl}" echo -e "${pdurl}"
fi fi
fn_script_log_info "${pdurl}" fn_script_log_info "${pdurl}"
alerturl="${pdurl}"
if [ -z "${exitbypass}" ]; then if [ -z "${exitbypass}" ]; then
core_exit.sh core_exit.sh
fi fi
alerturl="${pdurl}"

2
lgsm/functions/command_update.sh
View File

@ -27,7 +27,7 @@ elif [ "${shortname}" == "fctr" ]; then
elif [ "${shortname}" == "mta" ]; then elif [ "${shortname}" == "mta" ]; then
update_mta.sh update_mta.sh
elif [ "${shortname}" == "jk2" ]; then elif [ "${shortname}" == "jk2" ]; then
update_jediknight2.sh update_jediknight2.sh
else else
update_steamcmd.sh update_steamcmd.sh
fi fi

0
lgsm/functions/command_update_functions.sh
View File

2
lgsm/functions/core_functions.sh
View File

@ -7,7 +7,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v20.4.1" modulesversion="v20.5.0"
# Core # Core

2
lgsm/functions/fix_squad.sh
View File

@ -8,7 +8,7 @@
oldservercfg="${serverfiles}/Squad/ServerConfig/${servercfg}" oldservercfg="${serverfiles}/Squad/ServerConfig/${servercfg}"
if [ -f "${oldservercfg}" ] && [ -f "${servercfgfullpath}" ]; then if [ -f "${oldservercfg}" ] && [ -f "${servercfgfullpath}" ]; then
# diff old and new config - if it is different move the old config over the new one # diff old and new config - if it is different move the old config over the new one
if [ $(diff -c "${oldservercfg}" "${servercfgfullpath}" | wc -l) -gt 0 ]; then if [ "$(diff -c "${oldservercfg}" "${servercfgfullpath}" | wc -l)" -gt 0 ]; then
fixname="Migrate server config to new Game folder" fixname="Migrate server config to new Game folder"
fn_fix_msg_start fn_fix_msg_start
mv -v "${oldservercfg}" "${servercfgfullpath}" mv -v "${oldservercfg}" "${servercfgfullpath}"

2
lgsm/functions/info_config.sh
View File

@ -1248,7 +1248,7 @@ fn_info_config_sdtd(){
else else
servername=$(grep "ServerName" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"") servername=$(grep "ServerName" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")
serverpassword=$(grep "ServerPassword" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"") serverpassword=$(grep "ServerPassword" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")
port=$(grep "ServerPort" "${servercfgfullpath}" | egrep -o 'value="[0-9]+"' | tr -cd '[:digit:]') port=$(grep "ServerPort" "${servercfgfullpath}" | grep -Eo 'value="[0-9]+"' | tr -cd '[:digit:]')
queryport=${port:-"0"} queryport=${port:-"0"}
webadminenabled=$(grep "ControlPanelEnabled" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"") webadminenabled=$(grep "ControlPanelEnabled" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")

4
lgsm/functions/info_distro.sh
View File

@ -264,11 +264,11 @@ if [ "$(command -v jq 2>/dev/null)" ]; then
if [ "${steammaster}" == "true" ]; then if [ "${steammaster}" == "true" ]; then
# Will query server IP addresses first. # Will query server IP addresses first.
for queryip in "${queryips[@]}"; do for queryip in "${queryips[@]}"; do
masterserver=$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null) masterserver="$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
done done
# Should that not work it will try the external IP. # Should that not work it will try the external IP.
if [ "${masterserver}" == "0" ]; then if [ "${masterserver}" == "0" ]; then
masterserver=$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null) masterserver="$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
fi fi
if [ "${masterserver}" == "0" ]; then if [ "${masterserver}" == "0" ]; then
displaymasterserver="false" displaymasterserver="false"

4
lgsm/functions/mods_list.sh
View File

@ -35,8 +35,8 @@ get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.fileName')
get5latestfilepath=$(echo -e "${get5lastbuild}" | jq -r '.relativePath') get5latestfilepath=$(echo -e "${get5lastbuild}" | jq -r '.relativePath')
get5url="https://ci.splewis.net/job/get5/lastSuccessfulBuild/artifact/${get5latestfilepath}" get5url="https://ci.splewis.net/job/get5/lastSuccessfulBuild/artifact/${get5latestfilepath}"
csgopuglatest=$(curl -sL https://api.github.com/repos/splewis/csgo-pug-setup/releases/latest | jq '.assets[]') csgopuglatest=$(curl -sL https://api.github.com/repos/splewis/csgo-pug-setup/releases/latest | jq '.assets[]')
csgopuglatestfile=$(echo -e "${}" | jq -r '.name') csgopuglatestfile=$(echo -e "${csgopuglatest}" | jq -r '.name')
csgopuglatestlink=$(echo -e "${}" | jq -r '.browser_download_url') csgopuglatestlink=$(echo -e "${csgopuglatest}" | jq -r '.browser_download_url')
# Oxide # Oxide
oxiderustlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url') oxiderustlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url')
oxidehurtworldlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | jq -r '.assets[].browser_download_url') oxidehurtworldlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | jq -r '.assets[].browser_download_url')

2
linuxgsm.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v20.4.1" version="v20.5.0"
shortname="core" shortname="core"
gameservername="core" gameservername="core"
commandname="CORE" commandname="CORE"

11
tests/tests_defaultcfg/defaultcfg_0.txt
View File

@ -1,8 +1,6 @@
stats stats
displayip displayip
postalert postalert
postdays
posttarget
discordalert discordalert
discordwebhook discordwebhook
emailalert emailalert
@ -19,10 +17,13 @@ mailgunemail
pushbulletalert pushbulletalert
pushbullettoken pushbullettoken
channeltag channeltag
pushoveralert rocketchatalert
pushovertoken rocketchatwebhook
rocketchattoken
slackalert slackalert
slackwebhook slackwebhook
pushoveralert
pushovertoken
telegramalert telegramalert
telegramtoken telegramtoken
telegramchatid telegramchatid
@ -38,6 +39,8 @@ sleeptime
stopmode stopmode
querymode querymode
querytype querytype
consoleverbose
consoleinteract
gamename gamename
engine engine
glibc glibc

2
tests/tests_fctrserver.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v20.4.1" version="v20.5.0"
shortname="fctr" shortname="fctr"
gameservername="fctrserver" gameservername="fctrserver"
commandname="CORE" commandname="CORE"

2
tests/tests_jc2server.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v20.4.1" version="v20.5.0"
shortname="jc2" shortname="jc2"
gameservername="jc2server" gameservername="jc2server"
commandname="CORE" commandname="CORE"

2
tests/tests_mcserver.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v20.4.1" version="v20.5.0"
shortname="mc" shortname="mc"
gameservername="mcserver" gameservername="mcserver"
commandname="CORE" commandname="CORE"

2
tests/tests_ts3server.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v20.4.1" version="v20.5.0"
shortname="ts3" shortname="ts3"
gameservername="ts3server" gameservername="ts3server"
commandname="CORE" commandname="CORE"

Write Preview
Loading…
Cancel
Save