[Draft] Update 0.8 (#25)
* get rid of file handling through grpc and signalr * fix upload on controller * adapt usersetpairpermissions * send user perms * server-side fixes * rework file upload * adjust log level to debug in docker standalone json * update dependencies --------- Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
@@ -37,11 +37,7 @@ services:
|
||||
image: darkarchon/mare-synchronos-server:latest
|
||||
restart: on-failure
|
||||
environment:
|
||||
MareSynchronos__CdnFullUrl: "http://darkarchon.internet-box.ch:9999"
|
||||
MareSynchronos__CdnShardConfiguration__0__CdnFullUrl: "${DEV_MARE_CDNURL}"
|
||||
MareSynchronos__CdnShardConfiguration__0__FileMatch: "^[012345678]"
|
||||
MareSynchronos__CdnShardConfiguration__1__CdnFullUrl: "${DEV_MARE_CDNURL2}"
|
||||
MareSynchronos__CdnShardConfiguration__1__FileMatch: "^[789ABCDEF]"
|
||||
MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}"
|
||||
volumes:
|
||||
- ../config/sharded/server-shard-main.json:/opt/MareSynchronosServer/appsettings.json
|
||||
- ../log/server-shard-main/:/opt/MareSynchronosServer/logs/:rw
|
||||
@@ -94,6 +90,13 @@ services:
|
||||
mare-files:
|
||||
image: darkarchon/mare-synchronos-staticfilesserver:latest
|
||||
restart: on-failure
|
||||
ports:
|
||||
- 6200:6200/tcp
|
||||
environment:
|
||||
MareSynchronos__CdnShardConfiguration__0__CdnFullUrl: "${DEV_MARE_FILES1}"
|
||||
MareSynchronos__CdnShardConfiguration__0__FileMatch: "^[012345678]"
|
||||
MareSynchronos__CdnShardConfiguration__1__CdnFullUrl: "${DEV_MARE_FILES2}"
|
||||
MareSynchronos__CdnShardConfiguration__1__FileMatch: "^[789ABCDEF]"
|
||||
volumes:
|
||||
- ../config/sharded/files-shard-main.json:/opt/MareSynchronosStaticFilesServer/appsettings.json
|
||||
- ../log/files-standalone/:/opt/MareSynchronosStaticFilesServer/logs/:rw
|
||||
@@ -117,7 +120,7 @@ services:
|
||||
- postgres_socket:/var/run/postgresql/:rw
|
||||
- ../data/files-shard-1/:/marecache/:rw
|
||||
ports:
|
||||
- 6200:6200/tcp
|
||||
- 6201:6200/tcp
|
||||
depends_on:
|
||||
mare-files:
|
||||
condition: service_healthy
|
||||
@@ -131,7 +134,7 @@ services:
|
||||
- postgres_socket:/var/run/postgresql/:rw
|
||||
- ../data/files-shard-2/:/marecache/:rw
|
||||
ports:
|
||||
- 6201:6200/tcp
|
||||
- 6202:6200/tcp
|
||||
depends_on:
|
||||
mare-files:
|
||||
condition: service_healthy
|
||||
|
||||
@@ -65,6 +65,7 @@ services:
|
||||
- 6200:6200/tcp
|
||||
restart: on-failure
|
||||
environment:
|
||||
MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}"
|
||||
DOTNET_USE_POLLING_FILE_WATCHER: 1
|
||||
volumes:
|
||||
- ../config/standalone/files-standalone.json:/opt/MareSynchronosStaticFilesServer/appsettings.json
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
},
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Warning",
|
||||
"Microsoft": "Warning",
|
||||
"Default": "Debug",
|
||||
"Microsoft": "Debug",
|
||||
"Microsoft.Hosting.Lifetime": "Information",
|
||||
"MareSynchronosStaticFilesServer": "Information",
|
||||
"MareSynchronosShared": "Information",
|
||||
"MareSynchronosStaticFilesServer": "Debug",
|
||||
"MareSynchronosShared": "Debug",
|
||||
"System.IO": "Information"
|
||||
},
|
||||
"File": {
|
||||
@@ -44,10 +44,6 @@
|
||||
"Endpoints": {
|
||||
"Http": {
|
||||
"Url": "http://+:6200"
|
||||
},
|
||||
"Grpc": {
|
||||
"Protocols": "Http2",
|
||||
"Url": "http://+:6205"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -36,13 +36,13 @@
|
||||
""
|
||||
],
|
||||
"RedisConnectionString": "redis,password=secretredispassword",
|
||||
"CdnFullUrl": "http://localhost:6200/",
|
||||
"StaticFileServiceAddress": "http://mare-files:6205",
|
||||
"CdnFullUrl": "http://localhost:6200",
|
||||
"MaxExistingGroupsByUser": 3,
|
||||
"MaxJoinedGroupsByUser": 6,
|
||||
"MaxGroupUserCount": 100,
|
||||
"PurgeUnusedAccounts": false,
|
||||
"PurgeUnusedAccountsPeriodInDays": 14
|
||||
"PurgeUnusedAccountsPeriodInDays": 14,
|
||||
"ExpectedClientVersion": "0.8.0"
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Kestrel": {
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
"DbContextPoolSize": 512,
|
||||
"ShardName": "Services",
|
||||
"MetricsPort": 6150,
|
||||
"CdnFullUrl": "http://localhost:6200/",
|
||||
"MainServerAddress": "http://mare-server:6000/",
|
||||
"MainServerGrpcAddress": "http://mare-server:6005/",
|
||||
"DiscordBotToken": "",
|
||||
|
||||
Reference in New Issue
Block a user