changed local root path and stopped needing own user

This commit is contained in:
Mathew Guest 2019-08-18 23:50:40 -06:00
parent c2346b5b3b
commit 40feef7ab9
6 changed files with 148 additions and 20 deletions

@ -0,0 +1,62 @@
{
"uniqueTag": "MYINSTAGIBDEATHMATCH1.3",
"categories": [
"Gib"
],
"title": "Hi-Speed Arena",
"toolTip": "130% Speed One-Click Kills",
"description": "One-click kills, insanely fast.\n\n<UT.Hub.RulesText_Small>Mutators: {AW}Zoom Instagib, {AW}Translocator, ProMovement, TeamSkins, HitSounds</>\n<UT.Hub.RulesText_Small>Options: GameSpeed=1.3x, Translocator=ON</>\n<UT.Hub.RulesText_Small> > Shoutout to {AW} Clan for creating much of this content!</>\n<UT.Hub.RulesText_Small> > See the official Aggressive Warriors hub.</>\n<UT.Hub.RulesText_Small> > And their website: AggressiveWarriors.com</>",
"mapPrefixes": [],
"maxMapsInList": 0,
"epicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-NickTest1,/Game/EpicInternal/Lea/DM-Lea,/Game/RestrictedAssets/Maps/DM-BioTower,/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"defaultMap": "/Game/RestrictedAssets/Maps/DM-Chill",
"customMapList": [
"/Game/DM-Campgrounds-G1E/DM-Campgrounds-G1E",
"/Game/DM-Campgrounds-PRO-UNG",
"/Game/Laambo/Maps/CampThunder/DM-AW-CampThunderArena-v16",
"/Game/Laambo/Maps/DM-AW-CraterLakeArena-v7",
"/Game/Laambo/Maps/DM-AW-IDKyet-v14",
"/Game/Laambo/Maps/FightArena/DM-AW-FightArena-v14",
"/Game/Laambo/Maps/HayRide/DM-AW-HayRideNights-v12",
"/Game/Laambo/Maps/HolyShit/DM-AW-HolyShit-v3",
"/Game/Laambo/Maps/KnockOut/DM-AW-SkyArenaTest-v1",
"/Game/Laambo/Maps/ToonCastle/DM-AW-ToonCastleArena-v11",
"/Game/Laambo/Maps/UnrealBall/DM-AW-ClanArena-v7",
"/Game/Laambo/Maps/ZarkMaps/DM-AW-GiantTreeTest-v8",
"/Game/Laambo/Maps/ZarkMaps/DM-AW-RockScapeTestMap-v4",
"/Game/Laambo/Maps/thePit/DM-AW-thePit-v6",
"/Game/Maps/DM-1/DM-Pure_vrc_3",
"/Game/Maps/DM-Antalus",
"/Game/Maps/DM-Blaster-v16",
"/Game/Maps/DM-Campgrounds/DM-Campgrounds-03a",
"/Game/Maps/DM-Erase/DM-EraseV2_a03",
"/Game/Maps/DM-SuperFantasmic/DM-SuperFantasmic-02c",
"/Game/Rankin/DM-Rankin-LE",
"/Game/RestrictedAssets/Maps/DM-1on1-Roughinery",
"/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"/Game/RestrictedAssets/Maps/WIP/DM-BoneCrusher_MC2",
"/Game/RestrictedAssets/Maps/WIP/DM-Focus-LE",
"/Game/RestrictedAssets/Maps/WIP/DM-HyperBlast-UT99/DM-HyperBlast-UT99_metal-1",
"/Game/RestrictedAssets/Maps/WIP/DM-Idoma-UT3/DM-Idoma",
"/Game/RestrictedAssets/Maps/WIP/DM-StalwartXL-UT99/DM-StalwartXL-UT99_metal-1",
"/Game/Under/DM-Under-LE",
"/Game/halfblocked/halloweenarena/DM-AW-HalloweenArena-Redux12",
"/Game/maps/DM-Erase_Beta/DM-Erase_B9"
],
"maxPlayers": 12,
"maxTeamCount": -1,
"maxTeamSize": -1,
"maxPartySize": 5,
"displayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_DM.GB_DM'",
"gameMode": "/Script/UnrealTournament.UTDMGameMode",
"gameOptions": "?TimeLimit=10?GoalScore=0?ignoreidle=1?botfill=2?GameSpeed=1.300000?Mutator=AW_Instagib-v4,AW_Translocator-v6,GameSpeed,ProMovement,MutHitsounds,NoSpawnProtectionMutator,MutTeamskins",
"requiredPackages": [
],
"bTeamGame": false,
"bCompetitiveMatch": false,
"optionFlags": 65535,
"bHideFromUI": false,
"epicForceUIVisibility": 0
},

@ -0,0 +1,65 @@
{
"uniqueTag": "MYINSTAGIBDEATHMATCH",
"categories": [
"Gib"
],
"title": "Instagib Arena",
"toolTip": "Die lots!!",
"description": "One-click kills.\n\n<UT.Hub.RulesText_Small>Mutators: {AW}Zoom Instagib, {AW}Translocator, ProMovement, TeamSkins, HitSounds</>\n<UT.Hub.RulesText_Small>Options: Translocator=ON</>\n<UT.Hub.RulesText_Small> > Shoutout to {AW} Clan for creating much of this content!</>\n<UT.Hub.RulesText_Small> > See the official Aggressive Warriors hub.</>\n<UT.Hub.RulesText_Small> > And their website: AggressiveWarriors.com</>",
"mapPrefixes": [],
"maxMapsInList": 0,
"epicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-NickTest1,/Game/EpicInternal/Lea/DM-Lea,/Game/RestrictedAssets/Maps/DM-BioTower,/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"defaultMap": "/Game/RestrictedAssets/Maps/DM-Chill",
"customMapList": [
"/Game/DM-Campgrounds-G1E/DM-Campgrounds-G1E",
"/Game/DM-Campgrounds-PRO-UNG",
"/Game/Laambo/Maps/CampThunder/DM-AW-CampThunderArena-v16",
"/Game/Laambo/Maps/DM-AW-CraterLakeArena-v7",
"/Game/Laambo/Maps/DM-AW-IDKyet-v14",
"/Game/Laambo/Maps/FightArena/DM-AW-FightArena-v14",
"/Game/Laambo/Maps/HayRide/DM-AW-HayRideNights-v12",
"/Game/Laambo/Maps/HolyShit/DM-AW-HolyShit-v3",
"/Game/Laambo/Maps/KnockOut/DM-AW-SkyArenaTest-v1",
"/Game/Laambo/Maps/ToonCastle/DM-AW-ToonCastleArena-v11",
"/Game/Laambo/Maps/UnrealBall/DM-AW-ClanArena-v7",
"/Game/Laambo/Maps/ZarkMaps/DM-AW-GiantTreeTest-v8",
"/Game/Laambo/Maps/ZarkMaps/DM-AW-RockScapeTestMap-v4",
"/Game/Laambo/Maps/thePit/DM-AW-thePit-v6",
"/Game/Maps/DM-1/DM-Pure_vrc_3",
"/Game/Maps/DM-Antalus",
"/Game/Maps/DM-Blaster-v16",
"/Game/Maps/DM-Campgrounds/DM-Campgrounds-03a",
"/Game/Maps/DM-Erase/DM-EraseV2_a03",
"/Game/Maps/DM-SuperFantasmic/DM-SuperFantasmic-02c",
"/Game/Rankin/DM-Rankin-LE",
"/Game/RestrictedAssets/Maps/DM-1on1-Roughinery",
"/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"/Game/RestrictedAssets/Maps/WIP/DM-BoneCrusher_MC2",
"/Game/RestrictedAssets/Maps/WIP/DM-Focus-LE",
"/Game/RestrictedAssets/Maps/WIP/DM-HyperBlast-UT99/DM-HyperBlast-UT99_metal-1",
"/Game/RestrictedAssets/Maps/WIP/DM-Idoma-UT3/DM-Idoma",
"/Game/RestrictedAssets/Maps/WIP/DM-StalwartXL-UT99/DM-StalwartXL-UT99_metal-1",
"/Game/Under/DM-Under-LE",
"/Game/halfblocked/halloweenarena/DM-AW-HalloweenArena-Redux12",
"/Game/maps/DM-Erase_Beta/DM-Erase_B9"
],
"maxPlayers": 6,
"maxTeamCount": -1,
"maxTeamSize": -1,
"maxPartySize": 5,
"displayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_DM.GB_DM'",
"gameMode": "/Script/UnrealTournament.UTDMGameMode",
"gameOptions": "?TimeLimit=10?GoalScore=0?botfill=2?ignoreidle=1?Mutator=AW_Instagib-v4,AW_Translocator-v6,ProMovement,MutTeamskins,MutHitsounds,NoSpawnProtectionMutator",
"requiredPackages": [
"MutTeamskins",
"MutHitsounds",
"NoSpawnProtectionMutator"
],
"bTeamGame": false,
"bCompetitiveMatch": false,
"optionFlags": 65535,
"bHideFromUI": false,
"epicForceUIVisibility": 0
},

@ -119,7 +119,7 @@
# BELOW has been moved to vars-dallas # BELOW has been moved to vars-dallas
# ---------------------------------------- # ----------------------------------------
# #
# export PROJECT_DIR="/home/ut4/serv" export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl"
# #
# # For creating RedirectReferences= Lines # # For creating RedirectReferences= Lines
# export REDIRECT_PROTOCOL="https" # export REDIRECT_PROTOCOL="https"
@ -424,7 +424,7 @@ start_server()
_UT4_print "Starting server!!" _UT4_print "Starting server!!"
(set -x (set -x
nohup ssh "$REMOTE_GAME_HOST" "$REMOTE_GAME_DIRECTORY"/start-server.sh & nohup ssh "$REMOTE_GAME_HOST" "$REMOTE_GAME_DIR"/start-server.sh &
) )
} }
@ -434,7 +434,7 @@ stop_server()
_UT4_print "Stopping all servers!" _UT4_print "Stopping all servers!"
(set -x (set -x
ssh "$REMOTE_GAME_HOST" "$REMOTE_GAME_DIRECTORY"/stop-server.sh ssh "$REMOTE_GAME_HOST" "$REMOTE_GAME_DIR"/stop-server.sh
) )
} }
@ -462,8 +462,9 @@ upload_redirects()
# Hide admin password from redirect: # Hide admin password from redirect:
# TODO(MG) hardcoded paths and hostname >.< # TODO(MG) hardcoded paths and hostname >.<
gameini="/srv/ut4-redirect/config/Game.ini" # (on the server)
engineini="/srv/ut4-redirect/config/Engine.ini" gameini="/srv/ut4-redirect.zavage.net/config/Game.ini"
engineini="/srv/ut4-redirect.zavage.net/config/Engine.ini"
(set -x (set -x
ssh mathewguest.com sed -i /ServerInstanceID=/c\ServerInstanceID=Hidden "$gameini" ssh mathewguest.com sed -i /ServerInstanceID=/c\ServerInstanceID=Hidden "$gameini"
@ -477,7 +478,7 @@ upload_redirects()
# Fix permissions for redirect: # Fix permissions for redirect:
(set -x (set -x
ssh mathewguest.com 'chown http.http /srv/ut4-redirect -R' ssh mathewguest.com 'chown http.http /srv/ut4-redirect.zavage.net -R'
) )
} }
@ -501,9 +502,9 @@ upload_server()
--exclude "Saved/Crashes/*" \ --exclude "Saved/Crashes/*" \
--exclude "Saved/Logs/*" \ --exclude "Saved/Logs/*" \
"$PROJECT_DIR"/instance/ \ "$PROJECT_DIR"/instance/ \
"$REMOTE_GAME_HOST":"$REMOTE_GAME_DIRECTORY" "$REMOTE_GAME_HOST":"$REMOTE_GAME_DIR"
rsync -avzp "$PROJECT_DIR"/ut4-server-ctl.sh "$REMOTE_GAME_HOST":"$REMOTE_GAME_DIRECTORY" rsync -avzp "$PROJECT_DIR"/ut4-server-ctl.sh "$REMOTE_GAME_HOST":"$REMOTE_GAME_DIR"
) )
} }
@ -532,7 +533,7 @@ _install_config()
_UT4_print Installing file: "$f" _UT4_print Installing file: "$f"
(set -x (set -x
cp "$CONFIG_DIR"/config/"$f" "$PROJECT_DIR"/instance/LinuxServer/UnrealTournament/Saved/Config/LinuxServer/ cp "$CONFIG_DIR"/"$f" "$PROJECT_DIR"/instance/LinuxServer/UnrealTournament/Saved/Config/LinuxServer/
) )
@ -540,7 +541,7 @@ _install_config()
_UT4_print Installing file: "$f" _UT4_print Installing file: "$f"
(set -x (set -x
cp "$CONFIG_DIR"/config/"$f" "$PROJECT_DIR"/instance/LinuxServer/UnrealTournament/Saved/Config/LinuxServer/ cp "$CONFIG_DIR"/"$f" "$PROJECT_DIR"/instance/LinuxServer/UnrealTournament/Saved/Config/LinuxServer/
) )
} }
@ -644,7 +645,7 @@ _validate_env_vars()
echo 'REDIRECT_PROTOCOL: '"$REDIRECT_PROTOCOL" echo 'REDIRECT_PROTOCOL: '"$REDIRECT_PROTOCOL"
echo 'REDIRECT_URL: '"$REDIRECT_URL" echo 'REDIRECT_URL: '"$REDIRECT_URL"
echo 'REMOTE_GAME_HOST: '"$REMOTE_GAME_HOST" echo 'REMOTE_GAME_HOST: '"$REMOTE_GAME_HOST"
echo 'REMOTE_GAME_DIRECTORY: '"$REMOTE_GAME_DIRECTORY" echo 'REMOTE_GAME_DIRECTORY: '"$REMOTE_GAME_DIR"
echo 'REMOTE_REDIRECT_HOST: '"$REMOTE_REDIRECT_HOST" echo 'REMOTE_REDIRECT_HOST: '"$REMOTE_REDIRECT_HOST"
echo echo

@ -1,9 +1,9 @@
export PROJECT_DIR="/home/ut4/serv" export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl"
export CONFIG_DIR="/home/ut4/serv/server-dallas" export CONFIG_DIR="/home/mathew/dev/zavage/ut4-server-ctl/server-dallas/config"
export REDIRECT_PROTOCOL="https" export REDIRECT_PROTOCOL="https"
export REDIRECT_URL="ut4-redirect.zavage.net" export REDIRECT_URL="ut4-redirect.zavage.net"
export REMOTE_GAME_HOST="ut4-dallas" export REMOTE_GAME_HOST="ut4-linode"
export REMOTE_GAME_DIR="/home/ut4/serv" export REMOTE_GAME_DIR="/home/ut4/serv"
export REMOTE_REDIRECT_HOST="root@45.33.76.178:/srv/ut4-redirect.zavage.net" export REMOTE_REDIRECT_HOST="root@45.33.76.178:/srv/ut4-redirect.zavage.net"

@ -1,10 +1,10 @@
export PROJECT_DIR="/home/ut4/serv" export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl"
export CONFIG_DIR="/home/ut4/serv/server-fremont" export CONFIG_DIR="/home/mathew/dev/zavage/ut4-server-ctl/server-fremont/config"
export REDIRECT_PROTOCOL="https" export REDIRECT_PROTOCOL="https"
export REDIRECT_URL="ut4-redirect.zavage.net" export REDIRECT_URL="ut4-redirect.zavage.net"
export REMOTE_GAME_HOST="ut4-fremont" export REMOTE_GAME_HOST="ut4-fremont"
export REMOTE_GAME_DIRECTORY="/home/ut4/serv" export REMOTE_GAME_DIR="/home/ut4/serv"
export REMOTE_REDIRECT_HOST="mathewguest.com:/srv/ut4-redirect.zavage.net" export REMOTE_REDIRECT_HOST="mathewguest.com:/srv/ut4-redirect.zavage.net"

@ -1,10 +1,10 @@
export PROJECT_DIR="/home/ut4/serv" export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl"
export CONFIG_DIR="/home/ut4/serv/server-newark" export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl/server-newark/config"
export REDIRECT_PROTOCOL="https" export REDIRECT_PROTOCOL="https"
export REDIRECT_URL="ut4-redirect.zavage.net" export REDIRECT_URL="ut4-redirect.zavage.net"
export REMOTE_GAME_HOST="ut4-newark" export REMOTE_GAME_HOST="ut4-newark"
export REMOTE_GAME_DIRECTORY="/home/ut4/serv" export REMOTE_GAME_DIR="/home/ut4/serv"
export REMOTE_REDIRECT_HOST="mathewguest.com:/srv/ut4-redirect.zavage.net" export REMOTE_REDIRECT_HOST="mathewguest.com:/srv/ut4-redirect.zavage.net"