ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2025-12-12 14:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- reload configs on change

Browse source 
- remove grpc config service replace with http
- add messaging to channel
This commit is contained in:
rootdarkarchon 2023-02-25 12:20:59 +01:00
parent 3490c5c8d8
commit aa03d400d4
38 changed files with 304 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Docker/run/compose/mare-sharded.yml
View file

@ -82,6 +82,7 @@ services:
restart: on-failure
environment:
MareSynchronos__DiscordBotToken: "${DEV_MARE_DISCORDTOKEN}"
MareSynchronos__DiscordChannelForMessages: "${DEV_MARE_DISCORDCHANNEL}"
volumes:
- ../config/standalone/services-standalone.json:/opt/MareSynchronosServices/appsettings.json
- ../log/services-standalone/:/opt/MareSynchronosServices/logs/:rw

7
Docker/run/compose/mare-standalone.yml
View file

@ -28,6 +28,7 @@ services:
- 6000:6000/tcp
environment:
MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}"
DOTNET_USE_POLLING_FILE_WATCHER: 1
volumes:
- ../config/standalone/server-standalone.json:/opt/MareSynchronosServer/appsettings.json
- ../log/server-standalone/:/opt/MareSynchronosServer/logs/:rw
@ -46,11 +47,15 @@ services:
restart: on-failure
environment:
MareSynchronos__DiscordBotToken: "${DEV_MARE_DISCORDTOKEN}"
MareSynchronos__DiscordChannelForMessages: "${DEV_MARE_DISCORDCHANNEL}"
DOTNET_USE_POLLING_FILE_WATCHER: 1
volumes:
- ../config/standalone/services-standalone.json:/opt/MareSynchronosServices/appsettings.json
- ../log/services-standalone/:/opt/MareSynchronosServices/logs/:rw
- postgres_socket:/var/run/postgresql/:rw
depends_on:
mare-server:
condition: service_healthy
postgres:
condition: service_healthy
@ -59,6 +64,8 @@ services:
ports:
- 6200:6200/tcp
restart: on-failure
environment:
DOTNET_USE_POLLING_FILE_WATCHER: 1
volumes:
- ../config/standalone/files-standalone.json:/opt/MareSynchronosStaticFilesServer/appsettings.json
- ../log/files-standalone/:/opt/MareSynchronosStaticFilesServer/logs/:rw

8
Docker/run/config/sharded/files-shard-1.json
View file

@ -28,17 +28,17 @@
"DbContextPoolSize": 512,
"ShardName": "Files Shard 1",
"MetricsPort": 6250,
"FileServerGrpcAddress": "http://mare-files:6205",
"ForcedDeletionOfFilesAfterHours": 2,
"CacheSizeHardLimitInGiB": 5,
"UnusedFileRetentionPeriodInDays": 14,
"CacheDirectory": "/marecache/",
"RemoteCacheSourceUri": "http://mare-files:6200/",
"MainServerGrpcAddress": "http://mare-server:6005",
"DownloadTimeoutSeconds": 30,
"DownloadQueueSize": 50,
"DownloadQueueReleaseSeconds": 15,
"RedisConnectionString": "redis,password=secretredispassword"
"RedisConnectionString": "redis,password=secretredispassword",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",
"MainServerAddress": "http://mare-server:6000",
"MainFileServerAddress": "http://mare-files:6200"
},
"AllowedHosts": "*",
"Kestrel": {

8
Docker/run/config/sharded/files-shard-2.json
View file

@ -28,17 +28,17 @@
"DbContextPoolSize": 512,
"ShardName": "Files Shard 2",
"MetricsPort": 6250,
"FileServerGrpcAddress": "http://mare-files:6205",
"ForcedDeletionOfFilesAfterHours": 2,
"CacheSizeHardLimitInGiB": 5,
"UnusedFileRetentionPeriodInDays": 14,
"CacheDirectory": "/marecache/",
"RemoteCacheSourceUri": "http://mare-files:6200/",
"MainServerGrpcAddress": "http://mare-server:6005",
"DownloadTimeoutSeconds": 30,
"DownloadQueueSize": 50,
"DownloadQueueReleaseSeconds": 15,
"RedisConnectionString": "redis,password=secretredispassword"
"RedisConnectionString": "redis,password=secretredispassword",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",
"MainServerAddress": "http://mare-server:6000",
"MainFileServerAddress": "http://mare-files:6200"
},
"AllowedHosts": "*",
"Kestrel": {

6
Docker/run/config/sharded/files-shard-main.json
View file

@ -34,8 +34,10 @@
"UnusedFileRetentionPeriodInDays": 14,
"CacheDirectory": "/marecache/",
"RemoteCacheSourceUri": "",
"MainServerGrpcAddress": "http://mare-server:6005",
"RedisConnectionString": "redis,password=secretredispassword"
"RedisConnectionString": "redis,password=secretredispassword",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",
"MainServerAddress": "http://mare-server:6000",
"MainFileServerAddress": ""
},
"AllowedHosts": "*",
"Kestrel": {

5
Docker/run/config/sharded/server-shard-1.json
View file

@ -28,8 +28,9 @@
"DbContextPoolSize": 512,
"ShardName": "Shard 1",
"MetricsPort": 6050,
"MainServerGrpcAddress": "http://mare-server:6005",
"RedisConnectionString": "redis,password=secretredispassword"
"MainServerAddress": "http://mare-server:6000",
"RedisConnectionString": "redis,password=secretredispassword",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring"
},
"AllowedHosts": "*",
"Kestrel": {

5
Docker/run/config/sharded/server-shard-2.json
View file

@ -28,8 +28,9 @@
"DbContextPoolSize": 512,
"ShardName": "Shard 2",
"MetricsPort": 6050,
"MainServerGrpcAddress": "http://mare-server:6005",
"RedisConnectionString": "redis,password=secretredispassword"
"MainServerAddress": "http://mare-server:6000",
"RedisConnectionString": "redis,password=secretredispassword",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring"
},
"AllowedHosts": "*",
"Kestrel": {

6
Docker/run/config/standalone/files-standalone.json
View file

@ -34,8 +34,10 @@
"UnusedFileRetentionPeriodInDays": 14,
"CacheDirectory": "/marecache/",
"RemoteCacheSourceUri": "",
"MainServerGrpcAddress": "http://mare-server:6005",
"RedisConnectionString": "redis,password=secretredispassword"
"MainServerAddress": "http://mare-server:6000/",
"RedisConnectionString": "redis,password=secretredispassword",
"MainFileServerAddress": "",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring"
},
"AllowedHosts": "*",
"Kestrel": {

2
Docker/run/config/standalone/server-standalone.json
View file

@ -28,7 +28,7 @@
"DbContextPoolSize": 512,
"ShardName": "Main",
"MetricsPort": 6050,
"MainServerGrpcAddress": "",
"MainServerAddress": "",
"FailedAuthForTempBan": 5,
"TempBanDurationInMinutes": 5,
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",

5
Docker/run/config/standalone/services-standalone.json
View file

@ -28,8 +28,11 @@
"DbContextPoolSize": 512,
"ShardName": "Services",
"MetricsPort": 6150,
"MainServerGrpcAddress": "http://mare-server:6005",
"MainServerAddress": "http://mare-server:6000/",
"MainServerGrpcAddress": "http://mare-server:6005/",
"DiscordBotToken": "",
"DiscordChannelForMessages": "",
"Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring",
"RedisConnectionString": "redis,password=secretredispassword"
},
"AllowedHosts": "*",