mirror of
https://github.com/Caraxi/mare.server.git
synced 2025-12-12 21:57:22 +01:00
a
This commit is contained in:
parent
616b96981d
commit
bc1c884562
26 changed files with 209 additions and 498 deletions
|
|
@ -28,10 +28,10 @@ services:
|
|||
image: darkarchon/mare-synchronos-server:latest
|
||||
restart: on-failure
|
||||
ports:
|
||||
- 6000:6000/tcp
|
||||
- 6050:6050/tcp
|
||||
- 6300:6300/tcp
|
||||
- 6350:6350/tcp
|
||||
environment:
|
||||
MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}"
|
||||
MareSynchronos__CdnFullUrl: "http://127.0.0.1:6200/marecache"
|
||||
MareSynchronos__XIVAPIKey: "${DEV_MARE_XIVAPIKEY}"
|
||||
DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
volumes:
|
||||
|
|
@ -42,34 +42,34 @@ services:
|
|||
postgres:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "curl --fail http://localhost:6000/health || exit 1"]
|
||||
test: ["CMD-SHELL", "curl --fail http://localhost:6300/health || exit 1"]
|
||||
retries: 60
|
||||
start_period: 10s
|
||||
timeout: 1s
|
||||
|
||||
mare-auth:
|
||||
image: darkarchon/mare-synchronos-authservice:latest
|
||||
restart: on-failure
|
||||
environment:
|
||||
DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
volumes:
|
||||
- ../config/standalone/authservice-standalone.json:/opt/MareSynchronosAuthService/appsettings.json
|
||||
- ../log/authservice-standalone/:/opt/MareSynchronosAuthService/logs/:rw
|
||||
- postgres_socket:/var/run/postgresql/:rw
|
||||
depends_on:
|
||||
mare-server:
|
||||
condition: service_healthy
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
#
|
||||
# mare-auth:
|
||||
# image: darkarchon/mare-synchronos-authservice:latest
|
||||
# restart: on-failure
|
||||
# environment:
|
||||
# DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
# volumes:
|
||||
# - ../config/standalone/authservice-standalone.json:/opt/MareSynchronosAuthService/appsettings.json
|
||||
# - ../log/authservice-standalone/:/opt/MareSynchronosAuthService/logs/:rw
|
||||
# - postgres_socket:/var/run/postgresql/:rw
|
||||
# depends_on:
|
||||
# mare-server:
|
||||
# condition: service_healthy
|
||||
# postgres:
|
||||
# condition: service_healthy
|
||||
|
||||
mare-services:
|
||||
image: darkarchon/mare-synchronos-services:latest
|
||||
restart: on-failure
|
||||
environment:
|
||||
MareSynchronos__DiscordBotToken: "${DEV_MARE_DISCORDTOKEN}"
|
||||
MareSynchronos__DiscordChannelForMessages: "${DEV_MARE_DISCORDCHANNEL}"
|
||||
MareSynchronos__DiscordChannelForReports: "${DEV_MARE_DISCORDCHANNEL}"
|
||||
MareSynchronos__DiscordChannelForCommands: "${DEV_MARE_DISCORDCHANNEL}"
|
||||
MareSynchronos__DiscordChannelForMessages: "926997505848254507"
|
||||
MareSynchronos__DiscordChannelForReports: "926997505848254507"
|
||||
MareSynchronos__DiscordChannelForCommands: "926997505848254507"
|
||||
DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
volumes:
|
||||
- ../config/standalone/services-standalone.json:/opt/MareSynchronosServices/appsettings.json
|
||||
|
|
@ -87,13 +87,13 @@ services:
|
|||
- 6200:6200/tcp
|
||||
restart: on-failure
|
||||
environment:
|
||||
MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}"
|
||||
MareSynchronos__CdnFullUrl: "http://127.0.0.1:6200/marecache"
|
||||
DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
volumes:
|
||||
- ../config/standalone/files-standalone.json:/opt/MareSynchronosStaticFilesServer/appsettings.json
|
||||
- ../log/files-standalone/:/opt/MareSynchronosStaticFilesServer/logs/:rw
|
||||
- postgres_socket:/var/run/postgresql/:rw
|
||||
- ../data/files-standalone/:/marecache/:rw
|
||||
- D:\mareserverfiles\:/marecache/:rw
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
"Default": "Warning",
|
||||
"Microsoft": "Warning",
|
||||
"Microsoft.Hosting.Lifetime": "Information",
|
||||
"MareSynchronosStaticFilesServer": "Debug",
|
||||
"MareSynchronosShared": "Debug",
|
||||
"MareSynchronosStaticFilesServer": "Trace",
|
||||
"MareSynchronosShared": "Trace",
|
||||
"System.IO": "Information",
|
||||
},
|
||||
"File": {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"Microsoft": "Warning",
|
||||
"Microsoft.Hosting.Lifetime": "Information",
|
||||
"Microsoft.EntityFramework": "Warning",
|
||||
"MareSynchronosServer": "Debug",
|
||||
"MareSynchronosServer": "Trace",
|
||||
"MareSynchronosShared": "Debug",
|
||||
"System.IO": "Information",
|
||||
"MareSynchronosServer.Services.SystemInfoService": "Warning"
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
"MareSynchronos": {
|
||||
"DbContextPoolSize": 512,
|
||||
"ShardName": "Main",
|
||||
"MetricsPort": 6050,
|
||||
"MetricsPort": 6350,
|
||||
"MainServerAddress": "",
|
||||
"FailedAuthForTempBan": 5,
|
||||
"TempBanDurationInMinutes": 5,
|
||||
|
|
@ -38,20 +38,20 @@
|
|||
""
|
||||
],
|
||||
"RedisConnectionString": "redis,password=secretredispassword",
|
||||
"CdnFullUrl": "http://localhost:6200",
|
||||
"CdnFullUrl": "http://localhost:6200/marecache",
|
||||
"MaxExistingGroupsByUser": 6,
|
||||
"MaxJoinedGroupsByUser": 10,
|
||||
"MaxGroupUserCount": 100,
|
||||
"PurgeUnusedAccounts": false,
|
||||
"PurgeUnusedAccountsPeriodInDays": 14,
|
||||
"ExpectedClientVersion": "0.9.0",
|
||||
"ExpectedClientVersion": "0.11.22",
|
||||
"XIVAPIKey": ""
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Kestrel": {
|
||||
"Endpoints": {
|
||||
"Http": {
|
||||
"Url": "http://+:6000"
|
||||
"Url": "http://+:6300"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@
|
|||
"ShardName": "Services",
|
||||
"MetricsPort": 6150,
|
||||
"CdnFullUrl": "http://localhost:6200/",
|
||||
"MainServerAddress": "http://mare-server:6000/",
|
||||
"MainServerAddress": "http://mare-server:6300/",
|
||||
"MainServerGrpcAddress": "http://mare-server:6005/",
|
||||
"DiscordBotToken": "",
|
||||
"DiscordChannelForMessages": "",
|
||||
"DiscordChannelForCommands": "",
|
||||
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",
|
||||
"RedisConnectionString": "redis,password=secretredispassword",
|
||||
"VanityRoles": {"984484868241096724":"Main Developer", "1012008556259725398":"Patreon Subscriber"}
|
||||
"VanityRoles": {"1097028541666836500":"Main Developer", "1012008556259725398":"Patreon Subscriber"}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Kestrel": {
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
@echo off
|
||||
docker compose -f compose\mare-standalone.yml -p standalone up
|
||||
docker compose -f compose\mare-standalone.yml -p standalone up -d
|
||||
Loading…
Add table
Add a link
Reference in a new issue