From 5188d5506873f8e069495b1f347b4b0c2ddaa10b Mon Sep 17 00:00:00 2001 From: celine Date: Mon, 1 Sep 2025 20:03:16 +0000 Subject: [PATCH] Moved Docker setup --- Docker/Readme.md | 39 ----- .../Dockerfile-MareSynchronosAuthService | 32 ---- .../Dockerfile-MareSynchronosAuthService-git | 30 ---- Docker/build/Dockerfile-MareSynchronosServer | 32 ---- .../build/Dockerfile-MareSynchronosServer-git | 30 ---- .../build/Dockerfile-MareSynchronosServices | 32 ---- .../Dockerfile-MareSynchronosServices-git | 30 ---- ...Dockerfile-MareSynchronosStaticFilesServer | 32 ---- ...erfile-MareSynchronosStaticFilesServer-git | 30 ---- .../linux-git/docker-build-authservice.sh | 2 - Docker/build/linux-git/docker-build-server.sh | 2 - .../build/linux-git/docker-build-services.sh | 2 - .../docker-build-staticfilesserver.sh | 2 - Docker/build/linux-git/docker-build.sh | 5 - .../linux-local/docker-build-authservice.sh | 2 - .../build/linux-local/docker-build-server.sh | 4 - .../linux-local/docker-build-services.sh | 4 - .../docker-build-staticfilesserver.sh | 4 - Docker/build/linux-local/docker-build.sh | 5 - .../windows-git/docker-build-authservice.bat | 3 - .../build/windows-git/docker-build-server.bat | 2 - .../windows-git/docker-build-services.bat | 3 - .../docker-build-staticfilesserver.bat | 3 - Docker/build/windows-git/docker-build.bat | 6 - .../docker-build-authservice.bat | 4 - .../windows-local/docker-build-server.bat | 4 - .../windows-local/docker-build-services.bat | 4 - .../docker-build-staticfilesserver.bat | 4 - Docker/build/windows-local/docker-build.bat | 6 - Docker/run/compose/mare-sharded.yml | 145 ------------------ Docker/run/compose/mare-standalone.yml | 106 ------------- Docker/run/config/sharded/files-shard-1.json | 53 ------- Docker/run/config/sharded/files-shard-2.json | 53 ------- .../run/config/sharded/files-shard-main.json | 56 ------- Docker/run/config/sharded/haproxy-shards.cfg | 30 ---- Docker/run/config/sharded/server-shard-1.json | 45 ------ Docker/run/config/sharded/server-shard-2.json | 45 ------ .../run/config/sharded/server-shard-main.json | 71 --------- .../standalone/authservice-standalone.json | 42 ----- .../config/standalone/files-standalone.json | 53 ------- .../config/standalone/server-standalone.json | 60 -------- .../standalone/services-standalone.json | 46 ------ Docker/run/linux-sharded-daemon-start.sh | 2 - Docker/run/linux-sharded-daemon-stop.sh | 2 - Docker/run/linux-sharded.sh | 2 - Docker/run/linux-standalone-daemon-start.sh | 2 - Docker/run/linux-standalone-daemon-stop.sh | 2 - Docker/run/linux-standalone.sh | 2 - Docker/run/windows-sharded-daemon-start.bat | 2 - Docker/run/windows-sharded-daemon-stop.bat | 2 - Docker/run/windows-sharded.bat | 2 - .../run/windows-standalone-daemon-start.bat | 2 - Docker/run/windows-standalone-daemon-stop.bat | 2 - Docker/run/windows-standalone.bat | 2 - 54 files changed, 1187 deletions(-) delete mode 100644 Docker/Readme.md delete mode 100644 Docker/build/Dockerfile-MareSynchronosAuthService delete mode 100644 Docker/build/Dockerfile-MareSynchronosAuthService-git delete mode 100644 Docker/build/Dockerfile-MareSynchronosServer delete mode 100644 Docker/build/Dockerfile-MareSynchronosServer-git delete mode 100644 Docker/build/Dockerfile-MareSynchronosServices delete mode 100644 Docker/build/Dockerfile-MareSynchronosServices-git delete mode 100644 Docker/build/Dockerfile-MareSynchronosStaticFilesServer delete mode 100644 Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git delete mode 100644 Docker/build/linux-git/docker-build-authservice.sh delete mode 100644 Docker/build/linux-git/docker-build-server.sh delete mode 100644 Docker/build/linux-git/docker-build-services.sh delete mode 100644 Docker/build/linux-git/docker-build-staticfilesserver.sh delete mode 100644 Docker/build/linux-git/docker-build.sh delete mode 100644 Docker/build/linux-local/docker-build-authservice.sh delete mode 100644 Docker/build/linux-local/docker-build-server.sh delete mode 100644 Docker/build/linux-local/docker-build-services.sh delete mode 100644 Docker/build/linux-local/docker-build-staticfilesserver.sh delete mode 100644 Docker/build/linux-local/docker-build.sh delete mode 100644 Docker/build/windows-git/docker-build-authservice.bat delete mode 100644 Docker/build/windows-git/docker-build-server.bat delete mode 100644 Docker/build/windows-git/docker-build-services.bat delete mode 100644 Docker/build/windows-git/docker-build-staticfilesserver.bat delete mode 100644 Docker/build/windows-git/docker-build.bat delete mode 100644 Docker/build/windows-local/docker-build-authservice.bat delete mode 100644 Docker/build/windows-local/docker-build-server.bat delete mode 100644 Docker/build/windows-local/docker-build-services.bat delete mode 100644 Docker/build/windows-local/docker-build-staticfilesserver.bat delete mode 100644 Docker/build/windows-local/docker-build.bat delete mode 100644 Docker/run/compose/mare-sharded.yml delete mode 100644 Docker/run/compose/mare-standalone.yml delete mode 100644 Docker/run/config/sharded/files-shard-1.json delete mode 100644 Docker/run/config/sharded/files-shard-2.json delete mode 100644 Docker/run/config/sharded/files-shard-main.json delete mode 100644 Docker/run/config/sharded/haproxy-shards.cfg delete mode 100644 Docker/run/config/sharded/server-shard-1.json delete mode 100644 Docker/run/config/sharded/server-shard-2.json delete mode 100644 Docker/run/config/sharded/server-shard-main.json delete mode 100644 Docker/run/config/standalone/authservice-standalone.json delete mode 100644 Docker/run/config/standalone/files-standalone.json delete mode 100644 Docker/run/config/standalone/server-standalone.json delete mode 100644 Docker/run/config/standalone/services-standalone.json delete mode 100644 Docker/run/linux-sharded-daemon-start.sh delete mode 100644 Docker/run/linux-sharded-daemon-stop.sh delete mode 100644 Docker/run/linux-sharded.sh delete mode 100644 Docker/run/linux-standalone-daemon-start.sh delete mode 100644 Docker/run/linux-standalone-daemon-stop.sh delete mode 100644 Docker/run/linux-standalone.sh delete mode 100644 Docker/run/windows-sharded-daemon-start.bat delete mode 100644 Docker/run/windows-sharded-daemon-stop.bat delete mode 100644 Docker/run/windows-sharded.bat delete mode 100644 Docker/run/windows-standalone-daemon-start.bat delete mode 100644 Docker/run/windows-standalone-daemon-stop.bat delete mode 100644 Docker/run/windows-standalone.bat diff --git a/Docker/Readme.md b/Docker/Readme.md deleted file mode 100644 index 99b3600..0000000 --- a/Docker/Readme.md +++ /dev/null @@ -1,39 +0,0 @@ -# Mare Synchronos Docker Setup -This is primarily aimed at developers who want to spin up their own local server for development purposes without having to spin up a VM. -Obligatory requires Docker to be installed on the machine. - -There are two directories: `build` and `run` - -## 1. build images -There is two ways to build the necessary docker images which are differentiated by the folders `-local` and `-git` -- -local will run the image build against the current locally present sources -- -git will run the image build against the latest git main commit -It is possible to build all required images at once by running `docker-build.bat/sh` (Server, Servies, StaticFilesServer) or all 3 separately with `docker-build-.bat/sh` - -## 2. Configure ports + token -You should set up 2 environment variables that hold server specific configuration and open up ports. -The default ports used through the provided configuration are `6000` for the main server and `6200` as well as `6201` for the files downloads. -Both ports should be open to your computer through your router if you wish to test this with clients. - -Furthermore there are two environment variables `DEV_MARE_CDNURL` and `DEV_MARE_DISCORDTOKEN` which you are required to set. -`DEV_MARE_CDNURL` should point to `http://:6200/cache/` and `DEV_MARE_DISCORDTOKEN` is an oauth token from a bot you need to create through the Discord bot portal. -You should also set `DEV_MARE_CDNURL2` to `http://:6201/cache/` -It is enough to set them as User variables. The compose files refer to those environment variables to overwrite configuration settings for the Server and Services to set those respective values. -It is also possible to set those values in the configuration.json files themselves. -Without a valid Discord bot you will not be able to register accounts without fumbling around in the PostgreSQL database. - -## 3. Run Mare Server -The run folder contains two major Mare configurations which is `standalone` and `sharded`. -Both configurations default to port `6000` for the main server connection and `6200` for the files downloads. Sharded configuration additionally uses `6201` for downloads. No HTTPS. -All `appsettings.json` configurations provided are extensive at the point of writing, note the differences between the shard configurations and the main servers respectively. -They can be used as examples if you want to spin up your own servers otherwise. - -The scripts to start the respective services are divided by name, the `daemon-start/stop` files use `compose up -d` to run it in the background and to be able to stop the containers as well. -The respective docker-compose files lie in the `compose` folder. I would not recommend editing them unless you know what you are doing. -All data (postgresql and files uploads) will be thrown into the `data` folder after startup. -All logs from the mare services will be thrown into `logs`, divided by shard, where applicable. - -The `standalone` configuration features PostgeSQL, Mare Server, Mare StaticFilesServer and Mare Services. -The `sharded` configuration features PostgreSQL, Redis, HAProxy, Mare Server Main, 2 Mare Server Shards, Mare Services, Mare StaticFilesServer Main and 2 Mare StaticFilesServer Shards. -Haproxy is set up that it takes the same ports as the `standalone` configuration and distributes the connections between the shards. -In theory it should be possible to switch between the `standalone` and `sharded` configuration by shutting down one composition container and starting up the other. They share the same Database. \ No newline at end of file diff --git a/Docker/build/Dockerfile-MareSynchronosAuthService b/Docker/build/Dockerfile-MareSynchronosAuthService deleted file mode 100644 index 9ede4d0..0000000 --- a/Docker/build/Dockerfile-MareSynchronosAuthService +++ /dev/null @@ -1,32 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -COPY MareAPI /server/MareAPI -COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared -COPY MareSynchronosServer/MareSynchronosAuthService /server/MareSynchronosServer/MareSynchronosAuthService - -WORKDIR /server/MareSynchronosServer/MareSynchronosAuthService/ - -RUN dotnet publish \ - --configuration=Debug \ - --os=linux \ - --output=/build \ - MareSynchronosAuthService.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /build /opt/MareSynchronosAuthService -RUN chown -R mare:mare /opt/MareSynchronosAuthService -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosAuthService - -CMD ["./MareSynchronosAuthService"] diff --git a/Docker/build/Dockerfile-MareSynchronosAuthService-git b/Docker/build/Dockerfile-MareSynchronosAuthService-git deleted file mode 100644 index de9b7c1..0000000 --- a/Docker/build/Dockerfile-MareSynchronosAuthService-git +++ /dev/null @@ -1,30 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server - -WORKDIR /server/MareSynchronosServer/MareSynchronosAuthService/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/MareSynchronosAuthService \ - MareSynchronosAuthService.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /MareSynchronosAuthService /opt/MareSynchronosAuthService -RUN chown -R mare:mare /opt/MareSynchronosAuthService -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosAuthService - -CMD ["./MareSynchronosAuthService"] diff --git a/Docker/build/Dockerfile-MareSynchronosServer b/Docker/build/Dockerfile-MareSynchronosServer deleted file mode 100644 index ea802c4..0000000 --- a/Docker/build/Dockerfile-MareSynchronosServer +++ /dev/null @@ -1,32 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -COPY MareAPI /server/MareAPI -COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared -COPY MareSynchronosServer/MareSynchronosServer /server/MareSynchronosServer/MareSynchronosServer - -WORKDIR /server/MareSynchronosServer/MareSynchronosServer/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/build \ - MareSynchronosServer.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /build /opt/MareSynchronosServer -RUN chown -R mare:mare /opt/MareSynchronosServer -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosServer - -CMD ["./MareSynchronosServer"] diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git deleted file mode 100644 index fec5c0b..0000000 --- a/Docker/build/Dockerfile-MareSynchronosServer-git +++ /dev/null @@ -1,30 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server - -WORKDIR /server/MareSynchronosServer/MareSynchronosServer/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/MareSynchronosServer \ - MareSynchronosServer.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /MareSynchronosServer /opt/MareSynchronosServer -RUN chown -R mare:mare /opt/MareSynchronosServer -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosServer - -CMD ["./MareSynchronosServer"] diff --git a/Docker/build/Dockerfile-MareSynchronosServices b/Docker/build/Dockerfile-MareSynchronosServices deleted file mode 100644 index 4f67c45..0000000 --- a/Docker/build/Dockerfile-MareSynchronosServices +++ /dev/null @@ -1,32 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -COPY MareAPI /server/MareAPI -COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared -COPY MareSynchronosServer/MareSynchronosServices /server/MareSynchronosServer/MareSynchronosServices - -WORKDIR /server/MareSynchronosServer/MareSynchronosServices/ - -RUN dotnet publish \ - --configuration=Debug \ - --os=linux \ - --output=/build \ - MareSynchronosServices.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /build /opt/MareSynchronosServices -RUN chown -R mare:mare /opt/MareSynchronosServices -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosServices - -CMD ["./MareSynchronosServices"] diff --git a/Docker/build/Dockerfile-MareSynchronosServices-git b/Docker/build/Dockerfile-MareSynchronosServices-git deleted file mode 100644 index 964d0ac..0000000 --- a/Docker/build/Dockerfile-MareSynchronosServices-git +++ /dev/null @@ -1,30 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server - -WORKDIR /server/MareSynchronosServer/MareSynchronosServices/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/MareSynchronosServices \ - MareSynchronosServices.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /MareSynchronosServices /opt/MareSynchronosServices -RUN chown -R mare:mare /opt/MareSynchronosServices -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosServices - -CMD ["./MareSynchronosServices"] diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer deleted file mode 100644 index ff2adb2..0000000 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer +++ /dev/null @@ -1,32 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -COPY MareAPI /server/MareAPI -COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared -COPY MareSynchronosServer/MareSynchronosStaticFilesServer /server/MareSynchronosServer/MareSynchronosStaticFilesServer - -WORKDIR /server/MareSynchronosServer/MareSynchronosStaticFilesServer/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/build \ - MareSynchronosStaticFilesServer.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /build /opt/MareSynchronosStaticFilesServer -RUN chown -R mare:mare /opt/MareSynchronosStaticFilesServer -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosStaticFilesServer - -CMD ["./MareSynchronosStaticFilesServer"] diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git deleted file mode 100644 index 579c38b..0000000 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git +++ /dev/null @@ -1,30 +0,0 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD - -RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server - -WORKDIR /server/MareSynchronosServer/MareSynchronosStaticFilesServer/ - -RUN dotnet publish \ - --configuration=Release \ - --os=linux \ - --output=/MareSynchronosStaticFilesServer \ - MareSynchronosStaticFilesServer.csproj - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 - -RUN adduser \ - --disabled-password \ - --group \ - --no-create-home \ - --quiet \ - --system \ - mare - -COPY --from=BUILD /MareSynchronosStaticFilesServer /opt/MareSynchronosStaticFilesServer -RUN chown -R mare:mare /opt/MareSynchronosStaticFilesServer -RUN apt-get update; apt-get install curl -y - -USER mare:mare -WORKDIR /opt/MareSynchronosStaticFilesServer - -CMD ["./MareSynchronosStaticFilesServer"] diff --git a/Docker/build/linux-git/docker-build-authservice.sh b/Docker/build/linux-git/docker-build-authservice.sh deleted file mode 100644 index fd7d396..0000000 --- a/Docker/build/linux-git/docker-build-authservice.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/linux-git/docker-build-server.sh b/Docker/build/linux-git/docker-build-server.sh deleted file mode 100644 index 1815f92..0000000 --- a/Docker/build/linux-git/docker-build-server.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/linux-git/docker-build-services.sh b/Docker/build/linux-git/docker-build-services.sh deleted file mode 100644 index 93f9be7..0000000 --- a/Docker/build/linux-git/docker-build-services.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/linux-git/docker-build-staticfilesserver.sh b/Docker/build/linux-git/docker-build-staticfilesserver.sh deleted file mode 100644 index 3ec753c..0000000 --- a/Docker/build/linux-git/docker-build-staticfilesserver.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/linux-git/docker-build.sh b/Docker/build/linux-git/docker-build.sh deleted file mode 100644 index 958ab02..0000000 --- a/Docker/build/linux-git/docker-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -./docker-build-server.sh -./docker-build-authservice.sh -./docker-build-services.sh -./docker-build-staticfilesserver.sh \ No newline at end of file diff --git a/Docker/build/linux-local/docker-build-authservice.sh b/Docker/build/linux-local/docker-build-authservice.sh deleted file mode 100644 index 87859cd..0000000 --- a/Docker/build/linux-local/docker-build-authservice.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker build -t darkarchon/mare-synchronos-authservice:latest . -f ../Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/linux-local/docker-build-server.sh b/Docker/build/linux-local/docker-build-server.sh deleted file mode 100644 index 4c511aa..0000000 --- a/Docker/build/linux-local/docker-build-server.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cd ../../../ -docker build -t darkarchon/mare-synchronos-server:latest . -f ../Dockerfile-MareSynchronosServer --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file diff --git a/Docker/build/linux-local/docker-build-services.sh b/Docker/build/linux-local/docker-build-services.sh deleted file mode 100644 index f5a7f5f..0000000 --- a/Docker/build/linux-local/docker-build-services.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cd ../../../ -docker build -t darkarchon/mare-synchronos-services:latest . -f ../Dockerfile-MareSynchronosServices --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file diff --git a/Docker/build/linux-local/docker-build-staticfilesserver.sh b/Docker/build/linux-local/docker-build-staticfilesserver.sh deleted file mode 100644 index 3881a83..0000000 --- a/Docker/build/linux-local/docker-build-staticfilesserver.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -cd ../../../ -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ../Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm -cd Docker/build/linux-local \ No newline at end of file diff --git a/Docker/build/linux-local/docker-build.sh b/Docker/build/linux-local/docker-build.sh deleted file mode 100644 index 958ab02..0000000 --- a/Docker/build/linux-local/docker-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -./docker-build-server.sh -./docker-build-authservice.sh -./docker-build-services.sh -./docker-build-staticfilesserver.sh \ No newline at end of file diff --git a/Docker/build/windows-git/docker-build-authservice.bat b/Docker/build/windows-git/docker-build-authservice.bat deleted file mode 100644 index e504c93..0000000 --- a/Docker/build/windows-git/docker-build-authservice.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -docker build -t darkarchon/mare-synchronos-authservice:latest . -f ..\Dockerfile-MareSynchronosAuthService-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/windows-git/docker-build-server.bat b/Docker/build/windows-git/docker-build-server.bat deleted file mode 100644 index 7745a71..0000000 --- a/Docker/build/windows-git/docker-build-server.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker build -t darkarchon/mare-synchronos-server:latest . -f ..\Dockerfile-MareSynchronosServer-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/windows-git/docker-build-services.bat b/Docker/build/windows-git/docker-build-services.bat deleted file mode 100644 index c99c8d5..0000000 --- a/Docker/build/windows-git/docker-build-services.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -docker build -t darkarchon/mare-synchronos-services:latest . -f ..\Dockerfile-MareSynchronosServices-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/windows-git/docker-build-staticfilesserver.bat b/Docker/build/windows-git/docker-build-staticfilesserver.bat deleted file mode 100644 index ca314e0..0000000 --- a/Docker/build/windows-git/docker-build-staticfilesserver.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f ..\Dockerfile-MareSynchronosStaticFilesServer-git --no-cache --pull --force-rm \ No newline at end of file diff --git a/Docker/build/windows-git/docker-build.bat b/Docker/build/windows-git/docker-build.bat deleted file mode 100644 index 2deba89..0000000 --- a/Docker/build/windows-git/docker-build.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -call docker-build-server.bat -call docker-build-authservice.bat -call docker-build-services.bat -call docker-build-staticfilesserver.bat \ No newline at end of file diff --git a/Docker/build/windows-local/docker-build-authservice.bat b/Docker/build/windows-local/docker-build-authservice.bat deleted file mode 100644 index 335a328..0000000 --- a/Docker/build/windows-local/docker-build-authservice.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ..\..\..\ -docker build -t darkarchon/mare-synchronos-authservice:latest . -f Docker\build\Dockerfile-MareSynchronosAuthService --no-cache --pull --force-rm -cd Docker\build\windows-local \ No newline at end of file diff --git a/Docker/build/windows-local/docker-build-server.bat b/Docker/build/windows-local/docker-build-server.bat deleted file mode 100644 index eae4059..0000000 --- a/Docker/build/windows-local/docker-build-server.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ..\..\..\ -docker build -t darkarchon/mare-synchronos-server:latest . -f Docker\build\Dockerfile-MareSynchronosServer --no-cache --pull --force-rm -cd Docker\build\windows-local \ No newline at end of file diff --git a/Docker/build/windows-local/docker-build-services.bat b/Docker/build/windows-local/docker-build-services.bat deleted file mode 100644 index aff8e21..0000000 --- a/Docker/build/windows-local/docker-build-services.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ..\..\..\ -docker build -t darkarchon/mare-synchronos-services:latest . -f Docker\build\Dockerfile-MareSynchronosServices --no-cache --pull --force-rm -cd Docker\build\windows-local \ No newline at end of file diff --git a/Docker/build/windows-local/docker-build-staticfilesserver.bat b/Docker/build/windows-local/docker-build-staticfilesserver.bat deleted file mode 100644 index 72b174f..0000000 --- a/Docker/build/windows-local/docker-build-staticfilesserver.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd ..\..\..\ -docker build -t darkarchon/mare-synchronos-staticfilesserver:latest . -f Docker\build\Dockerfile-MareSynchronosStaticFilesServer --no-cache --pull --force-rm -cd Docker\build\windows-local \ No newline at end of file diff --git a/Docker/build/windows-local/docker-build.bat b/Docker/build/windows-local/docker-build.bat deleted file mode 100644 index 2deba89..0000000 --- a/Docker/build/windows-local/docker-build.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -call docker-build-server.bat -call docker-build-authservice.bat -call docker-build-services.bat -call docker-build-staticfilesserver.bat \ No newline at end of file diff --git a/Docker/run/compose/mare-sharded.yml b/Docker/run/compose/mare-sharded.yml deleted file mode 100644 index 45cbdd8..0000000 --- a/Docker/run/compose/mare-sharded.yml +++ /dev/null @@ -1,145 +0,0 @@ -services: - postgres: - image: postgres:latest - restart: always - environment: - POSTGRES_DB: - POSTGRES_USER: - POSTGRES_PASSWORD: - volumes: - - ../data/postgresql/:/var/lib/postgresql/data - - postgres_socket:/var/run/postgresql:rw - healthcheck: - test: ["CMD-SHELL", "pg_isready -U "] - interval: 5s - start_period: 5s - timeout: 5s - retries: 5 - - haproxy: - image: haproxy:latest - restart: always - ports: - - 6000:6000/tcp - volumes: - - ../config/sharded/haproxy-shards.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro - depends_on: - mare-server: - condition: service_healthy - - redis: - image: redis:latest - command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save \"\" --appendonly no --requirepass secretredispassword"] - volumes: - - cache:/data - - mare-server: - image: darkarchon/mare-synchronos-server:latest - restart: on-failure - environment: - MareSynchronos__CdnFullUrl: "${DEV_MARE_CDNURL}" - volumes: - - ../config/sharded/server-shard-main.json:/opt/MareSynchronosServer/appsettings.json - - ../log/server-shard-main/:/opt/MareSynchronosServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - postgres: - condition: service_healthy - healthcheck: - test: ["CMD-SHELL", "curl --fail http://localhost:6000/health || exit 1"] - retries: 60 - start_period: 10s - timeout: 1s - - mare-shard-1: - image: darkarchon/mare-synchronos-server:latest - restart: on-failure - volumes: - - ../config/sharded/server-shard-1.json:/opt/MareSynchronosServer/appsettings.json - - ../log/server-shard-1/:/opt/MareSynchronosServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - mare-server: - condition: service_healthy - - mare-shard-2: - image: darkarchon/mare-synchronos-server:latest - restart: on-failure - volumes: - - ../config/sharded/server-shard-2.json:/opt/MareSynchronosServer/appsettings.json - - ../log/server-shard-2/:/opt/MareSynchronosServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - mare-server: - 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}" - 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 - - 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 - - postgres_socket:/var/run/postgresql/:rw - - ../data/files-shard-main/:/marecache/:rw - depends_on: - mare-server: - condition: service_healthy - healthcheck: - test: curl --fail http://localhost:6200/health || exit 1 - retries: 60 - start_period: 10s - timeout: 1s - - mare-files-shard-1: - image: darkarchon/mare-synchronos-staticfilesserver:latest - restart: on-failure - volumes: - - ../config/sharded/files-shard-1.json:/opt/MareSynchronosStaticFilesServer/appsettings.json - - ../log/files-shard-1/:/opt/MareSynchronosStaticFilesServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - - ../data/files-shard-1/:/marecache/:rw - ports: - - 6201:6200/tcp - depends_on: - mare-files: - condition: service_healthy - - mare-files-shard-2: - image: darkarchon/mare-synchronos-staticfilesserver:latest - restart: on-failure - volumes: - - ../config/sharded/files-shard-2.json:/opt/MareSynchronosStaticFilesServer/appsettings.json - - ../log/files-shard-2/:/opt/MareSynchronosStaticFilesServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - - ../data/files-shard-2/:/marecache/:rw - ports: - - 6202:6200/tcp - depends_on: - mare-files: - condition: service_healthy - -volumes: - cache: - driver: local - postgres_socket: \ No newline at end of file diff --git a/Docker/run/compose/mare-standalone.yml b/Docker/run/compose/mare-standalone.yml deleted file mode 100644 index bce487b..0000000 --- a/Docker/run/compose/mare-standalone.yml +++ /dev/null @@ -1,106 +0,0 @@ -services: - postgres: - image: postgres:latest - command: ["postgres", "-c", "log_statement=all"] - restart: always - ports: - - 5432:5432/tcp - environment: - POSTGRES_DB: -DB NAME HERE- - POSTGRES_USER: -USER HERE- - POSTGRES_PASSWORD: -PASS HERE- - volumes: - - ../data/postgresql/:/var/lib/postgresql/data - - postgres_socket:/var/run/postgresql:rw - healthcheck: - test: ["CMD-SHELL", "pg_isready -U -USER HERE-"] - interval: 5s - timeout: 5s - retries: 5 - - redis: - image: redis:latest - command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save \"\" --appendonly no --requirepass -PASS HERE-"] - volumes: - - cache:/data - - lightless-server: - image: lightless/server:local - restart: on-failure - ports: - - 6000:6000/tcp - - 6050:6050/tcp - environment: - LightlessSync__CdnFullUrl: "${DEV_LIGHTLESS_CDNURL}" - LightlessSync__XIVAPIKey: "${DEV_LIGHTLESS_XIVAPIKEY}" - DOTNET_USE_POLLING_FILE_WATCHER: 1 - volumes: - - ../config/standalone/server-standalone.json:/opt/LightlessSyncServer/appsettings.json - - ../log/server-standalone/:/opt/LightlessSyncServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - postgres: - condition: service_healthy - healthcheck: - test: ["CMD-SHELL", "curl --fail http://localhost:6000/health || exit 1"] - retries: 60 - start_period: 10s - timeout: 1s - - lightless-auth: - image: lightless/auth:local - restart: on-failure - environment: - DOTNET_USE_POLLING_FILE_WATCHER: 1 - volumes: - - ../config/standalone/authservice-standalone.json:/opt/LightlessSyncAuthService/appsettings.json - - ../log/authservice-standalone/:/opt/LightlessSyncAuthService/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - lightless-server: - condition: service_healthy - postgres: - condition: service_healthy - - lightless-services: - image: lightless/services:local - restart: on-failure - environment: - LightlessSync__DiscordBotToken: "${DEV_LIGHTLESS_DISCORDTOKEN}" - LightlessSync__DiscordChannelForMessages: "${DEV_LIGHTLESS_DISCORDCHANNEL}" - LightlessSync__DiscordChannelForReports: "${DEV_LIGHTLESS_DISCORDCHANNEL}" - LightlessSync__DiscordChannelForCommands: "${DEV_LIGHTLESS_DISCORDCHANNEL}" - DOTNET_USE_POLLING_FILE_WATCHER: 1 - volumes: - - ../config/standalone/services-standalone.json:/opt/LightlessSyncServices/appsettings.json - - ../log/services-standalone/:/opt/LightlessSyncServices/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - depends_on: - lightless-server: - condition: service_healthy - postgres: - condition: service_healthy - - lightless-files: - image: lightless/files:local - ports: - - 6200:6200/tcp - restart: on-failure - environment: - LightlessSync__CdnFullUrl: "${DEV_LIGHTLESS_CDNURL}" - DOTNET_USE_POLLING_FILE_WATCHER: 1 - volumes: - - ../config/standalone/files-standalone.json:/opt/LightlessSyncStaticFilesServer/appsettings.json - - ../log/files-standalone/:/opt/LightlessSyncStaticFilesServer/logs/:rw - - postgres_socket:/var/run/postgresql/:rw - - ../data/files-standalone/:/lightlesscache/:rw - depends_on: - postgres: - condition: service_healthy - lightless-server: - condition: service_healthy - -volumes: - postgres_socket: - cache: - driver: local \ No newline at end of file diff --git a/Docker/run/config/sharded/files-shard-1.json b/Docker/run/config/sharded/files-shard-1.json deleted file mode 100644 index 2b36db7..0000000 --- a/Docker/run/config/sharded/files-shard-1.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosStaticFilesServer": "Debug", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Files Shard 1", - "MetricsPort": 6250, - "ForcedDeletionOfFilesAfterHours": 2, - "CacheSizeHardLimitInGiB": 5, - "UnusedFileRetentionPeriodInDays": 14, - "CacheDirectory": "/marecache/", - "DownloadTimeoutSeconds": 30, - "DownloadQueueSize": 50, - "DownloadQueueReleaseSeconds": 15, - "RedisConnectionString": "redis,password=secretredispassword", - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring", - "MainServerAddress": "http://mare-server:6000", - "MainFileServerAddress": "http://mare-files:6200" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6200" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/sharded/files-shard-2.json b/Docker/run/config/sharded/files-shard-2.json deleted file mode 100644 index 50a9307..0000000 --- a/Docker/run/config/sharded/files-shard-2.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosStaticFilesServer": "Debug", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Files Shard 2", - "MetricsPort": 6250, - "ForcedDeletionOfFilesAfterHours": 2, - "CacheSizeHardLimitInGiB": 5, - "UnusedFileRetentionPeriodInDays": 14, - "CacheDirectory": "/marecache/", - "DownloadTimeoutSeconds": 30, - "DownloadQueueSize": 50, - "DownloadQueueReleaseSeconds": 15, - "RedisConnectionString": "redis,password=secretredispassword", - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring", - "MainServerAddress": "http://mare-server:6000", - "MainFileServerAddress": "http://mare-files:6200" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6200" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/sharded/files-shard-main.json b/Docker/run/config/sharded/files-shard-main.json deleted file mode 100644 index d481e10..0000000 --- a/Docker/run/config/sharded/files-shard-main.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosStaticFilesServer": "Information", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Files", - "MetricsPort": 6250, - "FileServerGrpcAddress": "", - "ForcedDeletionOfFilesAfterHours": -1, - "CacheSizeHardLimitInGiB": -1, - "UnusedFileRetentionPeriodInDays": 14, - "CacheDirectory": "/marecache/", - "RemoteCacheSourceUri": "", - "RedisConnectionString": "redis,password=secretredispassword", - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring", - "MainServerAddress": "http://mare-server:6000", - "MainFileServerAddress": "" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6200" - }, - "Grpc": { - "Protocols": "Http2", - "Url": "http://+:6205" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/sharded/haproxy-shards.cfg b/Docker/run/config/sharded/haproxy-shards.cfg deleted file mode 100644 index 2075e1a..0000000 --- a/Docker/run/config/sharded/haproxy-shards.cfg +++ /dev/null @@ -1,30 +0,0 @@ -global - log /dev/log local0 - log /dev/log local1 notice - daemon - - ca-base /etc/ssl/certs - crt-base /etc/ssl/private - - ssl-default-bind-ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 - ssl-default-bind-ciphersuites TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256 - ssl-default-bind-options ssl-min-ver TLSv1.2 no-tls-tickets - -defaults - log global - mode http - option httplog - option dontlognull - timeout connect 5000 - timeout client 50000 - timeout server 50000 - -frontend mare - bind :6000 - default_backend mare-servers - -backend mare-servers - balance leastconn - cookie SERVER insert indirect nocache - server mare1 mare-shard-1:6000 cookie mare1 - server mare2 mare-shard-2:6000 cookie mare2 diff --git a/Docker/run/config/sharded/server-shard-1.json b/Docker/run/config/sharded/server-shard-1.json deleted file mode 100644 index 402babe..0000000 --- a/Docker/run/config/sharded/server-shard-1.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosServer": "Information", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Shard 1", - "MetricsPort": 6050, - "MainServerAddress": "http://mare-server:6000", - "RedisConnectionString": "redis,password=secretredispassword", - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6000" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/sharded/server-shard-2.json b/Docker/run/config/sharded/server-shard-2.json deleted file mode 100644 index f8a3228..0000000 --- a/Docker/run/config/sharded/server-shard-2.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosServer": "Information", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Shard 2", - "MetricsPort": 6050, - "MainServerAddress": "http://mare-server:6000", - "RedisConnectionString": "redis,password=secretredispassword", - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6000" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/sharded/server-shard-main.json b/Docker/run/config/sharded/server-shard-main.json deleted file mode 100644 index 5fb045d..0000000 --- a/Docker/run/config/sharded/server-shard-main.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=mare;Username=mare;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "MareSynchronosServer": "Information", - "MareSynchronosShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///mare--.log" - } - ] - } - }, - "MareSynchronos": { - "DbContextPoolSize": 512, - "ShardName": "Main", - "MetricsPort": 6050, - "MainServerGrpcAddress": "", - "FailedAuthForTempBan": 5, - "TempBanDurationInMinutes": 5, - "Jwt": "teststringteststringteststringteststringteststringteststringteststringteststringteststringteststring", - "WhitelistedIps": [ - "" - ], - "RedisConnectionString": "redis,password=secretredispassword", - "CdnFullUrl": "http://localhost:6200/", - "StaticFileServiceAddress": "http://mare-files:6205", - "MaxExistingGroupsByUser": 3, - "MaxJoinedGroupsByUser": 6, - "MaxGroupUserCount": 100, - "PurgeUnusedAccounts": false, - "PurgeUnusedAccountsPeriodInDays": 14, - "CdnShardConfiguration": [ - { - "FileMatch": "^[01234567]", - "CdnFullUrl": "" - }, - { - "FileMatch": "^[89ABCDEF]", - "CdnFullUrl": "" - } - ] - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6000" - }, - "Grpc": { - "Protocols": "Http2", - "Url": "http://+:6005" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/standalone/authservice-standalone.json b/Docker/run/config/standalone/authservice-standalone.json deleted file mode 100644 index a598d2e..0000000 --- a/Docker/run/config/standalone/authservice-standalone.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=;Username=;Password=;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "LightlessSyncServices": "Information", - "LightlessSyncShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///lightless--.log" - } - ] - } - }, - "LightlessSync": { - "DbContextPoolSize": 512, - "ShardName": "AuthServices", - "MetricsPort": 6150, - "Jwt": "", - "RedisConnectionString": "redis:6379,password=", - "FailedAuthForTempBan": 5, - "UseGeoIP": false, - "GeoIPDbCityFile": "" - }, - "AllowedHosts": "*", - "Kestrel": { - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/standalone/files-standalone.json b/Docker/run/config/standalone/files-standalone.json deleted file mode 100644 index 10cfd88..0000000 --- a/Docker/run/config/standalone/files-standalone.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=;Username=;Password=;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "LightlessSyncStaticFilesServer": "Debug", - "LightlessSyncShared": "Debug", - "System.IO": "Information", - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///lightless--.log" - } - ] - } - }, - "LightlessSync": { - "DbContextPoolSize": 512, - "ShardName": "Files", - "MetricsPort": 6250, - "ForcedDeletionOfFilesAfterHours": -1, - "CacheSizeHardLimitInGiB": -1, - "UnusedFileRetentionPeriodInDays": 14, - "CacheDirectory": "/lightlesscache/", - "RemoteCacheSourceUri": "", - "MainServerAddress": "http://-IPorDomainhere-:6000/", - "RedisConnectionString": "redis:6379,password=", - "MainFileServerAddress": "", - "Jwt": "", - "UseColdStorage": false, - "IsDistributionNode": true - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6200" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/standalone/server-standalone.json b/Docker/run/config/standalone/server-standalone.json deleted file mode 100644 index c959697..0000000 --- a/Docker/run/config/standalone/server-standalone.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=;Username=;Password=;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "Microsoft.EntityFramework": "Warning", - "LightlessSyncServer": "Debug", - "LightlessSyncShared": "Debug", - "System.IO": "Information", - "LightlessSyncServer.Services.SystemInfoService": "Warning" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///lightless--.log" - } - ] - } - }, - "LightlessSync": { - "DbContextPoolSize": 512, - "ShardName": "Main", - "MetricsPort": 6050, - "MainServerAddress": "", - "FailedAuthForTempBan": 5, - "TempBanDurationInMinutes": 5, - "Jwt": "", - "WhitelistedIps": [ - "" - ], - "RedisConnectionString": "redis:6379,password=", - "CdnFullUrl": "http://localhost:6200", - "MaxExistingGroupsByUser": 12, - "MaxJoinedGroupsByUser": 20, - "MaxGroupUserCount": 100, - "PurgeUnusedAccounts": false, - "PurgeUnusedAccountsPeriodInDays": 14, - "ExpectedClientVersion": "0.9.0", - "XIVAPIKey": "" - }, - "AllowedHosts": "*", - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://+:6000" - } - } - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/config/standalone/services-standalone.json b/Docker/run/config/standalone/services-standalone.json deleted file mode 100644 index 304341d..0000000 --- a/Docker/run/config/standalone/services-standalone.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Host=/var/run/postgresql;Port=5432;Database=;Username=;Password=;Keepalive=15;Minimum Pool Size=10;Maximum Pool Size=50;No Reset On Close=true;Max Auto Prepare=50;Enlist=false" - }, - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "LightlessSyncServices": "Information", - "LightlessSyncShared": "Information", - "System.IO": "Information" - }, - "File": { - "BasePath": "logs", - "FileAccessMode": "KeepOpenAndAutoFlush", - "FileEncodingName": "utf-8", - "DateFormat": "yyyMMdd", - "MaxFileSize": 104857600, - "Files": [ - { - "Path": "///lightless--.log" - } - ] - } - }, - "LightlessSync": { - "DbContextPoolSize": 512, - "ShardName": "Services", - "MetricsPort": 6150, - "CdnFullUrl": "http://localhost:6200/", - "MainServerAddress": "http://-IPorDomainHere-:6000/", - "MainServerGrpcAddress": "http://-IPorDomainHere-:6005/", - "DiscordBotToken": "", - "DiscordChannelForMessages": "", - "DiscordChannelForCommands": "", - "Jwt": "", - "RedisConnectionString": "redis:6379,password=", - "VanityRoles": {"1408568079394537684":"Lightless Developer", "1349429584688578584":"Mods", "1401582542238388355":"Patreon", "1409255218591432817":"Kofi", "1409253125952507904":"Pure"} - }, - "AllowedHosts": "*", - "Kestrel": { - }, - "IpRateLimiting": {}, - "IPRateLimitPolicies": {} -} \ No newline at end of file diff --git a/Docker/run/linux-sharded-daemon-start.sh b/Docker/run/linux-sharded-daemon-start.sh deleted file mode 100644 index 58b676e..0000000 --- a/Docker/run/linux-sharded-daemon-start.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-sharded.yml -p sharded up -d \ No newline at end of file diff --git a/Docker/run/linux-sharded-daemon-stop.sh b/Docker/run/linux-sharded-daemon-stop.sh deleted file mode 100644 index 06e0ded..0000000 --- a/Docker/run/linux-sharded-daemon-stop.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-sharded.yml -p sharded stop \ No newline at end of file diff --git a/Docker/run/linux-sharded.sh b/Docker/run/linux-sharded.sh deleted file mode 100644 index 2f3b570..0000000 --- a/Docker/run/linux-sharded.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-sharded.yml -p sharded up \ No newline at end of file diff --git a/Docker/run/linux-standalone-daemon-start.sh b/Docker/run/linux-standalone-daemon-start.sh deleted file mode 100644 index 561d430..0000000 --- a/Docker/run/linux-standalone-daemon-start.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-standalone.yml -p standalone up -d \ No newline at end of file diff --git a/Docker/run/linux-standalone-daemon-stop.sh b/Docker/run/linux-standalone-daemon-stop.sh deleted file mode 100644 index c977cc0..0000000 --- a/Docker/run/linux-standalone-daemon-stop.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-standalone.yml -p standalone stop \ No newline at end of file diff --git a/Docker/run/linux-standalone.sh b/Docker/run/linux-standalone.sh deleted file mode 100644 index a348205..0000000 --- a/Docker/run/linux-standalone.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -docker compose -f compose/mare-standalone.yml -p standalone up \ No newline at end of file diff --git a/Docker/run/windows-sharded-daemon-start.bat b/Docker/run/windows-sharded-daemon-start.bat deleted file mode 100644 index 8b132f3..0000000 --- a/Docker/run/windows-sharded-daemon-start.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-sharded.yml -p sharded up -d \ No newline at end of file diff --git a/Docker/run/windows-sharded-daemon-stop.bat b/Docker/run/windows-sharded-daemon-stop.bat deleted file mode 100644 index dfa5974..0000000 --- a/Docker/run/windows-sharded-daemon-stop.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-sharded.yml -p sharded stop \ No newline at end of file diff --git a/Docker/run/windows-sharded.bat b/Docker/run/windows-sharded.bat deleted file mode 100644 index 3f8cde2..0000000 --- a/Docker/run/windows-sharded.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-sharded.yml -p sharded up \ No newline at end of file diff --git a/Docker/run/windows-standalone-daemon-start.bat b/Docker/run/windows-standalone-daemon-start.bat deleted file mode 100644 index 6605d6d..0000000 --- a/Docker/run/windows-standalone-daemon-start.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-standalone.yml -p standalone up -d \ No newline at end of file diff --git a/Docker/run/windows-standalone-daemon-stop.bat b/Docker/run/windows-standalone-daemon-stop.bat deleted file mode 100644 index 2b725f4..0000000 --- a/Docker/run/windows-standalone-daemon-stop.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-standalone.yml -p standalone stop \ No newline at end of file diff --git a/Docker/run/windows-standalone.bat b/Docker/run/windows-standalone.bat deleted file mode 100644 index 747225f..0000000 --- a/Docker/run/windows-standalone.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -docker compose -f compose\mare-standalone.yml -p standalone up \ No newline at end of file