Merge pull request #2994 from jbaptperez/fix/magma-env-file

Uses a dedicated setting to generate the magma VITE_CALDERA_URL variable
mitre · Jun 20, 2024 · d18788a · d18788a
2 parents bababe4 + 0626285
commit d18788a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conf/default.yml b/conf/default.yml
@@ -22,6 +22,7 @@ app.contact.ftp.user: caldera_user
 app.contact.tcp: 0.0.0.0:7010
 app.contact.udp: 0.0.0.0:7011
 app.contact.websocket: 0.0.0.0:7012
+app.frontend.api_base_url: http://localhost:8888
 objects.planners.default: atomic
 crypt_salt: REPLACE_WITH_RANDOM_VALUE
 encryption_key: ADMIN123

diff --git a/server.py b/server.py
@@ -149,10 +149,9 @@ async def start_vue_dev_server():
 
 def configure_magma_env_file():
     logging.info("Setting VueJS environment file.")
-    host = BaseWorld.get_config("host")
-    port = BaseWorld.get_config("port")
+    url = BaseWorld.get_config("app.frontend.api_base_url")
     with open(f"{MAGMA_PATH}/.env", "w") as fp:
-        fp.write(f"VITE_CALDERA_URL=http://{host}:{port}")
+        fp.write(f"VITE_CALDERA_URL={url}")
 
 
 def _get_parser():