Updated envar flow

.gitignore

@@ -5,3 +5,7 @@ node_modules/
 src/desert/
 src/zips/
 src/uploads/
+# Env files
+.env
+.env.dev
+.env.prod

docker-compose.yml

@@ -1,28 +1,16 @@
 version: "3"
 services:
-  cairo.dunestorm.net:
-    image: cairo.dunestorm.net
-    ports:
-      - "52000:52000"
-    environment:
-      - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-
   nubian.dunestorm.net:
     image: nubian.dunestorm.net
     build: .
     ports:
       - "52001:52001"
     environment:
+      - ALEXANDRIA_INTERNAL_URL=${ALEXANDRIA_INTERNAL_URL}
       - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-      - CAIRO_URL=http://cairo.dunestorm.net:52000
-  alexandria.dunestorm.net:
-    image: mongo
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=admin
-      - MONGO_INITDB_ROOT_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-    volumes:
-      - /home/dunemask/Documents/dev/Dunestorm/mongodb/database:/data/db
-    ports:
-      - "27017:27017"
-    restart: unless-stopped
-    command: --quiet
+      - CAIRO_PUBLIC_URL=${CAIRO_PUBLIC_URL}
+    networks:
+      - dunestorm_dev
+networks:
+  dunestorm_dev:
+    external: true

src/api/storage.js

@@ -8,12 +8,15 @@ const {
 } = require("fs");
 const config = require("../config.json");
 const mongoose = require("mongoose");
-mongoose.connect(`${config.Storage.AlexandriaUrl}/nubian?authSource=admin`, {
-  useUnifiedTopology: true,
-  useNewUrlParser: true,
-  user: "admin",
-  pass: process.env.ALEXANDRIA_DATABASE_PASSWORD,
-});
+mongoose.connect(
+  `mongodb://${process.env.ALEXANDRIA_INTERNAL_URL}/nubian?authSource=admin`,
+  {
+    useUnifiedTopology: true,
+    useNewUrlParser: true,
+    user: "admin",
+    pass: process.env.ALEXANDRIA_DATABASE_PASSWORD,
+  }
+);
 
 const users = require("../schemas/user");
 const files = require("../schemas/file");

src/config.json

@@ -1,8 +1,7 @@
 {
   "Storage": {
-    "AlexandriaUrl": "mongodb://alexandria.dunestorm.net",
     "UploadPath": "src/uploads/",
-    "UserStorageSize": 2048,
+    "UserStorageSize": 25,
     "UserStorageUnit": 1048576,
     "UploadMaxSize": ""
   },

src/routes/stash-route.js

@@ -13,7 +13,7 @@ const cairoMiddleware = (req, res, next) => {
   if (req.token == null) return next();
   else
     axios
-      .get(`${process.env.CAIRO_URL}/user/data`, {
+      .get(`${process.env.CAIRO_PUBLIC_URL}/user/data`, {
         headers: { authorization: `Bearer ${req.token}` },
       })
       .then((authRes) => {