resolve merge conflict with server

OpenSource-Deadlock-Tools · Oct 7, 2024 · 61c349e · 61c349e
2 parents feb7c05 + dd00043
commit 61c349e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml
@@ -15,6 +15,8 @@ services:
 #      VIRTUAL_HOST: grafana.DOMAIN.de
 #      VIRTUAL_PORT: 3000
 #      LETSENCRYPT_HOST: grafana.DOMAIN.de
+#      GF_SERVER_DOMAIN: grafana.DOMAIN.de
+#      GF_SERVER_ROOT_URL: https://grafana.DOMAIN.de
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
       interval: 10s

diff --git a/spectator/client/.env-example b/spectator/client/.env-example
@@ -2,3 +2,8 @@ SPECTATOR_STEAM_ACCOUNTS='[
     {"username": "user1", "password": "pass1"},
     {"username": "user2", "password": "pass2"}
 ]'
+
+RABBITMQ_HOST=
+RABBITMQ_PORT=
+RABBITMQ_USER=
+RABBITMQ_PASS=
diff --git a/spectator/client/DeadlockSpectator/Program.cs b/spectator/client/DeadlockSpectator/Program.cs
@@ -32,8 +32,8 @@ private static void Main(string[] args)
 
         rmq_host = Environment.GetEnvironmentVariable("RABBITMQ_HOST") ?? "rabbitmq";
         rmq_port = int.Parse(Environment.GetEnvironmentVariable("RABBITMQ_PORT") ?? "5672");
-        rmq_user = Environment.GetEnvironmentVariable("RABBITMQ_ADMIN_USER") ?? "rmquser";
-        rmq_pass = Environment.GetEnvironmentVariable("RABBITMQ_ADMIN_PASS") ?? "rmqpass";
+        rmq_user = Environment.GetEnvironmentVariable("RABBITMQ_USER") ?? "rmquser";
+        rmq_pass = Environment.GetEnvironmentVariable("RABBITMQ_PASS") ?? "rmqpass";
 
         // Login to Steam
         client = new DeadlockClient(steam_user, steam_pass);

diff --git a/spectator/client/README.md b/spectator/client/README.md
@@ -6,19 +6,9 @@
 
 ### Usage:
 
-1. Create an `.env` file with the following:
-    ```bash
-    SPECTATOR_STEAM_ACCOUNTS='[
-        {"username": "user1", "password": "pass1"},
-        {"username": "user2", "password": "pass2"}
-    ]'
-
-    RABBITMQ_HOST=154.53.45.225
-    RABBITMQ_USER=devlock_admin
-    RABBITMQ_PASS=super_secret_password
-    ```
+1. Create an `.env` file by copying the `.env.example` file and filling in the required fields.
 
-    - In theory this list can have as few/many Steam accounts as you want. (I have tested with up to 2 accounts).
+    - In theory the list of accounts can have as few/many Steam accounts as you want. (I have tested with up to 2 accounts).
     - Each of the instances can communicate with others such that a spectate request is not sent to the same Match ID twice.
 
 2. Generate a `docker-compose.yml`: