Merge branch 'master' into feat/postgresql-database

# Conflicts: # docker-compose.yml
2023-08-20 18:30:52 +02:00
parent f33df59f49 754e5e61f2
commit 392a350eab
8 changed files with 14 additions and 27 deletions
--- a/config.yaml
+++ b/config.yaml
@@ -159,8 +159,8 @@ worlds:

 server:
    #Database Configuration
-    DB_URL_FORMAT: "jdbc:mysql://%s:3306/cosmic"
-    DB_HOST: "localhost"
+    DB_URL_FORMAT: "jdbc:mysql://%s:3306/cosmic" # If the docker ENV for DB_HOST is anything but "db", this string format should be changed from 3306 to 3307 (or whichever port it was changed to in docker) 
+    DB_HOST: "localhost" 
    DB_USER: "cosmic_server"
    DB_PASS: "snailshell"
    INIT_CONNECTION_POOL_TIMEOUT: 90    # Seconds