Skip to content

Commit a1f9345

Browse files
authored
Updates to match default config (#1366)
1 parent 5f65f3e commit a1f9345

4 files changed

+18
-73
lines changed

beammp.kvp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Meta.ContainerPolicyReason=The default executable on Linux is built for Debian 1
1818
Meta.ExtraSetupStepsURI=
1919
Meta.ConfigReleaseState=NotSpecified
2020
Meta.NoCommercialUsage=False
21-
Meta.ConfigVersion=1.2
21+
Meta.ConfigVersion=3
2222
Meta.AppConfigId=2cab46a3-651b-49be-bbd1-51a5d098924a
2323
App.DisplayName=BeamMP
2424
App.RootDir=./beammp/

beammpServerConfig.toml

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
[HTTP]
2-
HTTPServerEnabled = false
3-
UseSSL = false
4-
HTTPServerIP = "0.0.0.0"
5-
HTTPServerPort = 30815
6-
SSLCertPath = "./.ssl/HttpServer/cert.pem"
7-
SSLKeyPath = "./.ssl/HttpServer/key.pem"
8-
91
[Misc]
102
SendErrorsShowMessage = true
113
SendErrors = true
124
ImScaredOfUpdates = false
135

146
[General]
15-
Description = "A BeamMP server"
167
ResourceFolder = "Resources"
178
Map = "/levels/gridmap_v2/info.json"
189
MaxPlayers = 8
10+
Description = "A BeamMP server"
11+
Tags = "Freeroam"
1912
Port = 30814
2013
Private = true
2114
Debug = false

beammpconfig.json

+15-56
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,24 @@
5858
"Placeholder": "A BeamMP server",
5959
"EnumValues": {}
6060
},
61+
{
62+
"DisplayName": "Server Tags",
63+
"Category": "BeamMP:stadia_controller",
64+
"Subcategory": "Server:dns:1",
65+
"Description": "Comma-separated list of custom identifying tags for the server to make it easier to find in the server list.",
66+
"Keywords": "tags",
67+
"FieldName": "Tags",
68+
"InputType": "text",
69+
"ParamFieldName": "General.Tags",
70+
"DefaultValue": "Freeroam",
71+
"Placeholder": "Freeroam",
72+
"EnumValues": {}
73+
},
6174
{
6275
"DisplayName": "Port",
6376
"Category": "BeamMP:stadia_controller",
6477
"Subcategory": "Server:dns:1",
65-
"Description": "The main game port",
78+
"Description": "",
6679
"Keywords": "",
6780
"FieldName": "$MainGamePort",
6881
"InputType": "number",
@@ -161,7 +174,7 @@
161174
"DisplayName": "Resource Folder",
162175
"Category": "BeamMP:stadia_controller",
163176
"Subcategory": "Server:dns:1",
164-
"Description": "The folder for Resources inside the datastore.",
177+
"Description": "",
165178
"Keywords": "",
166179
"FieldName": "ResourceFolder",
167180
"InputType": "text",
@@ -245,59 +258,5 @@
245258
"True": "true",
246259
"False": "false"
247260
}
248-
},
249-
{
250-
"DisplayName": "HTTPServerIP",
251-
"Category": "BeamMP:stadia_controller",
252-
"Subcategory": "Server:dns:1",
253-
"Description": "The binding IP for the HTTP webserver.",
254-
"Keywords": "",
255-
"FieldName": "$ApplicationIPBinding",
256-
"InputType": "text",
257-
"ParamFieldName": "HTTP.HTTPServerIP",
258-
"Hidden": true,
259-
"EnumValues": {}
260-
},
261-
{
262-
"DisplayName": "HTTPServerPort",
263-
"Category": "BeamMP:stadia_controller",
264-
"Subcategory": "Server:dns:1",
265-
"Description": "The port used for the HTTP webserver.",
266-
"Keywords": "",
267-
"FieldName": "$HTTPServerPort",
268-
"InputType": "number",
269-
"ParamFieldName": "HTTP.HTTPServerPort",
270-
"Hidden": true,
271-
"EnumValues": {}
272-
},
273-
{
274-
"DisplayName": "Enable HTTP Server",
275-
"Category": "BeamMP:stadia_controller",
276-
"Subcategory": "Server:dns:1",
277-
"Description": "Enables the internal HTTP server.",
278-
"Keywords": "http,server,enabled,httpserverenabled",
279-
"FieldName": "HTTPServerEnabled",
280-
"InputType": "checkbox",
281-
"ParamFieldName": "HTTP.HTTPServerEnabled",
282-
"DefaultValue": "false",
283-
"EnumValues": {
284-
"True": "true",
285-
"False": "false"
286-
}
287-
},
288-
{
289-
"DisplayName": "Use SSL For HTTP Server",
290-
"Category": "BeamMP:stadia_controller",
291-
"Subcategory": "Server:dns:1",
292-
"Description": "Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files. Key and cert files should be stored in \".ssl/HttpServer/key.pem\" and \".ssl/HttpServer/cert.pem\" in the instance datastore.",
293-
"Keywords": "use,ssl,usessl",
294-
"FieldName": "UseSSL",
295-
"InputType": "checkbox",
296-
"ParamFieldName": "HTTP.UseSSL",
297-
"DefaultValue": "false",
298-
"EnumValues": {
299-
"True": "true",
300-
"False": "false"
301-
}
302261
}
303262
]

beammpports.json

-7
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,5 @@
55
"Name": "Main Game Port",
66
"Description": "Port used for main game traffic",
77
"Ref": "MainGamePort"
8-
},
9-
{
10-
"Protocol": "TCP",
11-
"Port": "30815",
12-
"Name": "HTTP Server Port",
13-
"Description": "Port used to access the HTTP webserver",
14-
"Ref": "HTTPServerPort"
158
}
169
]

0 commit comments

Comments
 (0)