diff --git a/fivem.kvp b/fivem.kvp index 0f4c27f90..51fc96d63 100644 --- a/fivem.kvp +++ b/fivem.kvp @@ -1,5 +1,5 @@ -Meta.DisplayName=FiveM - Grand Theft Auto V Server -Meta.Description=FiveM Multiplayer Mod for Grand Theft Auto V +Meta.DisplayName=FiveM - Grand Theft Auto V Legacy Server +Meta.Description=FiveM Multiplayer Mod for Grand Theft Auto V Legacy Meta.OS=Windows, Linux Meta.AarchSupport=Unknown Meta.Arch=x86_64 @@ -30,18 +30,18 @@ App.DisplayName=FiveM App.RootDir=./fivem/ App.BaseDirectory=./fivem/ App.SteamWorkshopDownloadLocation= -App.ExecutableWin=server\FXServer.exe -App.ExecutableLinux=server/alpine/opt/cfx-server/ld-musl-x86_64.so.1 +App.ExecutableWin=server/FXServer.exe +App.ExecutableLinux=server/run.sh App.WorkingDir=server-data -App.LinuxCommandLineArgs=--library-path "{{$FullBaseDir}}server/alpine/usr/lib/v8/:{{$FullBaseDir}}server/alpine/lib/:{{$FullBaseDir}}server/alpine/usr/lib/" -- "{{$FullBaseDir}}server/alpine/opt/cfx-server/FXServer" +set citizen_dir "{{$FullBaseDir}}server/alpine/opt/cfx-server/citizen/" +App.LinuxCommandLineArgs= App.WindowsCommandLineArgs= -App.CommandLineArgs={{$PlatformArgs}} {{CustomArgs}} +set gamename gta5 +set rcon_password {{$RemoteAdminPassword}} +set serverProfile default {{$FormattedArgs}} +exec server.cfg +App.CommandLineArgs={{$PlatformArgs}} {{CustomArgs}} +set gamename gta5 +set rcon_password {{$RemoteAdminPassword}} {{$FormattedArgs}} +exec server.cfg App.UseLinuxIOREDIR=False App.AppSettings={} App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"271590","YARN_TIMEOUT_CONFIG":"100000"} App.CommandLineParameterFormat=+{0} {1} App.CommandLineParameterDelimiter= -App.ExitMethod=String +App.ExitMethod=OS_CLOSE App.ExitTimeout=30 App.ExitString=quit App.ExitFile=app_exit.lck @@ -85,7 +85,7 @@ App.ApplicationReadyMode=RegexMatch Console.FilterMatchRegex=\e\](?:\d+);[^\x07]*\x07|\e\[(\d+;)*(\d+)?[ABCDHJKfmsu]|\e\[?[?\>\=\da-z]+ Console.FilterMatchReplacement= Console.ThrowawayMessageRegex= -Console.AppReadyRegex=^\[ citizen-server-impl\] Authenticated with cfx\.re Nucleus: .*$ +Console.AppReadyRegex=^\[.*\:.*\:.*\]\[tx\].*┃.*All ready! Please access:.*┃.*$ Console.UserJoinRegex=^$ Console.UserLeaveRegex=^$ Console.UserChatRegex=^$ @@ -94,7 +94,7 @@ Console.MetricsRegex= Console.SuppressLogAtStart=False Console.ActivateLogRegex= Console.UserActions={} -Limits.SleepMode=True +Limits.SleepMode=False Limits.SleepOnStart=False Limits.SleepDelayMinutes=5 Limits.DozeDelay=2 diff --git a/fivemconfig.json b/fivemconfig.json index 7501718d3..d957c9bea 100644 --- a/fivemconfig.json +++ b/fivemconfig.json @@ -204,7 +204,8 @@ "3095": "3095 (The Chop Shop)", "3258": "3258 (Bottom Dollar Bounties)", "3407": "3407 (Agents of Sabotage)", - "3570": "3570 (Money Fronts)" + "3570": "3570 (Money Fronts)", + "3751": "3751 (Safehouse in the Hills)" } }, { diff --git a/fivemserver.cfg b/fivemserver.cfg index 956a2edd3..55d5120f2 100644 --- a/fivemserver.cfg +++ b/fivemserver.cfg @@ -1,12 +1,13 @@ # This file is controlled by AMP. Any manual changes will be overwritten # If you need to add any extra settings, add them through the AMP UI -{{UserSettings}} - endpoint_add_tcp "{{ApplicationIPBinding}}:{{ServerPort}}" endpoint_add_udp "{{ApplicationIPBinding}}:{{ServerPort}}" sv_licenseKey "{{sv_licenseKey}}" set steam_webApiKey "{{steam_webApiKey}}" +sv_enforceGameBuild {{sv_enforceGameBuild}} +sv_maxClients {{sv_maxClients}} + sv_hostname "{{sv_hostname}}" sets sv_projectName "{{sv_projectName}}" sets sv_projectDesc "{{sv_projectDesc}}" @@ -15,18 +16,21 @@ sets locale "{{locale}}" load_server_icon "{{load_server_icon}}" sets banner_detail "{{banner_detail}}" sets banner_connecting "{{banner_connecting}}" + +{{sv_pureLevel}} +sv_requestParanoia {{sv_requestParanoia}} {{sv_master1}} -{{ensure}} sv_endpointPrivacy {{sv_endpointPrivacy}} -sv_enforceGameBuild {{sv_enforceGameBuild}} -sv_maxClients {{sv_maxClients}} + set onesync {{onesync}} set onesync_population {{onesync_population}} set onesync_distanceCullVehicles {{onesync_distanceCullVehicles}} set onesync_forceMigration {{onesync_forceMigration}} set onesync_workaround763185 {{onesync_workaround763185}} sv_scriptHookAllowed {{sv_scriptHookAllowed}} -{{sv_pureLevel}} -sv_requestParanoia {{sv_requestParanoia}} + +{{UserSettings}} {{AccessControlCommands}} + +{{ensure}} \ No newline at end of file diff --git a/redm.kvp b/redm.kvp index 44bf5f813..3ce98b4a0 100644 --- a/redm.kvp +++ b/redm.kvp @@ -30,18 +30,18 @@ App.DisplayName=RedM App.RootDir=./redm/ App.BaseDirectory=./redm/ App.SteamWorkshopDownloadLocation= -App.ExecutableWin=server\FXServer.exe -App.ExecutableLinux=server/alpine/opt/cfx-server/ld-musl-x86_64.so.1 +App.ExecutableWin=server/FXServer.exe +App.ExecutableLinux=server/run.sh App.WorkingDir=server-data -App.LinuxCommandLineArgs=--library-path "{{$FullBaseDir}}server/alpine/usr/lib/v8/:{{$FullBaseDir}}server/alpine/lib/:{{$FullBaseDir}}server/alpine/usr/lib/" -- "{{$FullBaseDir}}server/alpine/opt/cfx-server/FXServer" +set citizen_dir "{{$FullBaseDir}}server/alpine/opt/cfx-server/citizen/" +App.LinuxCommandLineArgs= App.WindowsCommandLineArgs= -App.CommandLineArgs={{$PlatformArgs}} {{CustomArgs}} +set gamename rdr3 +set rcon_password {{$RemoteAdminPassword}} +set serverProfile default {{$FormattedArgs}} +exec server.cfg +App.CommandLineArgs={{$PlatformArgs}} {{CustomArgs}} +set gamename rdr3 +set rcon_password {{$RemoteAdminPassword}} {{$FormattedArgs}} +exec server.cfg App.UseLinuxIOREDIR=False App.AppSettings={} App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"1174180","YARN_TIMEOUT_CONFIG":"100000"} App.CommandLineParameterFormat=+{0} {1} App.CommandLineParameterDelimiter= -App.ExitMethod=String +App.ExitMethod=OS_CLOSE App.ExitTimeout=30 App.ExitString=quit App.ExitFile=app_exit.lck @@ -85,7 +85,7 @@ App.ApplicationReadyMode=RegexMatch Console.FilterMatchRegex=\e\](?:\d+);[^\x07]*\x07|\e\[(\d+;)*(\d+)?[ABCDHJKfmsu]|\e\[?[?\>\=\da-z]+ Console.FilterMatchReplacement= Console.ThrowawayMessageRegex= -Console.AppReadyRegex=^\[ citizen-server-impl\] Authenticated with cfx\.re Nucleus: .*$ +Console.AppReadyRegex=^\[.*\:.*\:.*\]\[tx\].*┃.*All ready! Please access:.*┃.*$ Console.UserJoinRegex=^$ Console.UserLeaveRegex=^$ Console.UserChatRegex=^$ @@ -94,7 +94,7 @@ Console.MetricsRegex= Console.SuppressLogAtStart=False Console.ActivateLogRegex= Console.UserActions={} -Limits.SleepMode=True +Limits.SleepMode=False Limits.SleepOnStart=False Limits.SleepDelayMinutes=5 Limits.DozeDelay=2 diff --git a/redmserver.cfg b/redmserver.cfg index 956a2edd3..55d5120f2 100644 --- a/redmserver.cfg +++ b/redmserver.cfg @@ -1,12 +1,13 @@ # This file is controlled by AMP. Any manual changes will be overwritten # If you need to add any extra settings, add them through the AMP UI -{{UserSettings}} - endpoint_add_tcp "{{ApplicationIPBinding}}:{{ServerPort}}" endpoint_add_udp "{{ApplicationIPBinding}}:{{ServerPort}}" sv_licenseKey "{{sv_licenseKey}}" set steam_webApiKey "{{steam_webApiKey}}" +sv_enforceGameBuild {{sv_enforceGameBuild}} +sv_maxClients {{sv_maxClients}} + sv_hostname "{{sv_hostname}}" sets sv_projectName "{{sv_projectName}}" sets sv_projectDesc "{{sv_projectDesc}}" @@ -15,18 +16,21 @@ sets locale "{{locale}}" load_server_icon "{{load_server_icon}}" sets banner_detail "{{banner_detail}}" sets banner_connecting "{{banner_connecting}}" + +{{sv_pureLevel}} +sv_requestParanoia {{sv_requestParanoia}} {{sv_master1}} -{{ensure}} sv_endpointPrivacy {{sv_endpointPrivacy}} -sv_enforceGameBuild {{sv_enforceGameBuild}} -sv_maxClients {{sv_maxClients}} + set onesync {{onesync}} set onesync_population {{onesync_population}} set onesync_distanceCullVehicles {{onesync_distanceCullVehicles}} set onesync_forceMigration {{onesync_forceMigration}} set onesync_workaround763185 {{onesync_workaround763185}} sv_scriptHookAllowed {{sv_scriptHookAllowed}} -{{sv_pureLevel}} -sv_requestParanoia {{sv_requestParanoia}} + +{{UserSettings}} {{AccessControlCommands}} + +{{ensure}} \ No newline at end of file diff --git a/txadmin.kvp b/txadmin.kvp index b1c15f267..30cf6a5d5 100644 --- a/txadmin.kvp +++ b/txadmin.kvp @@ -30,12 +30,12 @@ App.DisplayName=txAdmin App.RootDir=./txadmin/ App.BaseDirectory=./txadmin/ App.SteamWorkshopDownloadLocation= -App.ExecutableWin=server\FXServer.exe -App.ExecutableLinux=server/alpine/opt/cfx-server/ld-musl-x86_64.so.1 +App.ExecutableWin=server/FXServer.exe +App.ExecutableLinux=server/run.sh App.WorkingDir=server-data -App.LinuxCommandLineArgs=--library-path "{{$FullBaseDir}}server/alpine/usr/lib/v8/:{{$FullBaseDir}}server/alpine/lib/:{{$FullBaseDir}}server/alpine/usr/lib/" -- "{{$FullBaseDir}}server/alpine/opt/cfx-server/FXServer" +set citizen_dir "{{$FullBaseDir}}server/alpine/opt/cfx-server/citizen/" +App.LinuxCommandLineArgs= App.WindowsCommandLineArgs= -App.CommandLineArgs={{$PlatformArgs}} +set txAdminPort {{$txAdminPort}} +set txAdminInterface {{$ApplicationIPBinding}} +App.CommandLineArgs={{$PlatformArgs}} App.UseLinuxIOREDIR=False App.AppSettings={} App.EnvironmentVariables={"TXHOST_TXA_PORT":"{{$txAdminPort}}","TXHOST_FXS_PORT":"{{$ServerPort}}","TXHOST_INTERFACE":"{{$ApplicationIPBinding}}"} @@ -85,7 +85,7 @@ App.ApplicationReadyMode=RegexMatch Console.FilterMatchRegex=\e\](?:\d+);[^\x07]*\x07|\e\[(\d+;)*(\d+)?[ABCDHJKfmsu]|\e\[?[?\>\=\da-z]+ Console.FilterMatchReplacement= Console.ThrowawayMessageRegex= -Console.AppReadyRegex=^\[[\d:]+\]\[tx:(FXRunner|FxRunner|FXProc)\]( Please open txAdmin on the browser to configure your server\.|(?:>> )?\[\d+\] (FXServer|FxServer) Started!)$ +Console.AppReadyRegex=^\[.*\:.*\:.*\]\[tx\].*┃.*All ready! Please access:.*┃.*$ Console.UserJoinRegex=^$ Console.UserLeaveRegex=^$ Console.UserChatRegex=^$ @@ -94,7 +94,7 @@ Console.MetricsRegex= Console.SuppressLogAtStart=False Console.ActivateLogRegex= Console.UserActions={} -Limits.SleepMode=True +Limits.SleepMode=False Limits.SleepOnStart=False Limits.SleepDelayMinutes=5 Limits.DozeDelay=2