Fixed merge issues

.env

@@ -21,6 +21,7 @@ SHUFFLE_DEFAULT_APIKEY=
 
 # Local location of your app directory. Can't use ~/
 # Files will get better at some point. Right now: local saving.
+SHUFFLE_APP_HOTLOAD_FOLDER=./shuffle-apps
 SHUFFLE_APP_HOTLOAD_LOCATION=./shuffle-apps
 SHUFFLE_FILE_LOCATION=./shuffle-files
 
@@ -29,18 +30,33 @@ BACKEND_HOSTNAME=shuffle-backend
 BACKEND_PORT=5001
 FRONTEND_PORT=3001
 FRONTEND_PORT_HTTPS=3443
+# CHANGE THIS IF YOU WANT GOOD LOCAL EXECUTIONS:
 OUTER_HOSTNAME=shuffle-backend
 DB_LOCATION=./shuffle-database
 
 # Proxy configurations. SHUFFLE_PASS_WORKER_PROXY must be FALSE to not pass the proxy information to sub-apps.
-# PS: It will skip proxy for
-SHUFFLE_HTTP_PROXY=
-SHUFFLE_HTTPS_PROXY=
+# PS: It will skip proxy for 
+HTTP_PROXY=
+HTTPS_PROXY=
 SHUFFLE_PASS_WORKER_PROXY=TRUE
+SHUFFLE_PASS_APP_PROXY=FALSE
 
 SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io
 SHUFFLE_BASE_IMAGE_NAME=frikky
-SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-0.8.60"
+SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-0.8.80"
 
 # Used for auto-cleanup of containers. REALLY important at scale.
 SHUFFLE_CONTAINER_AUTO_CLEANUP=false
+SHUFFLE_ELASTIC=true
+
+# DATABASE CONFIGURATIONS
+DATASTORE_EMULATOR_HOST=shuffle-database:8000
+#SHUFFLE_OPENSEARCH_URL=https://shuffle-opensearch:9200
+SHUFFLE_OPENSEARCH_URL=http://shuffle-opensearch:9200
+SHUFFLE_OPENSEARCH_USERNAME=
+SHUFFLE_OPENSEARCH_PASSWORD=
+SHUFFLE_OPENSEARCH_CERTIFICATE_FILE=
+SHUFFLE_OPENSEARCH_APIKEY=
+SHUFFLE_OPENSEARCH_CLOUDID=
+SHUFFLE_OPENSEARCH_PROXY=
+SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY=true