Huge config update and smtp fix for daemon

docker-compose.yml

@@ -1,49 +1,49 @@
 version: "3.5"
 
-volumes:
-  redis-trash1:
-
 services:
-  web:
+  nopaque:
     build:
       args:
-        GID: ${GID}
-        UID: ${UID}
+        GID: ${HOST_GID}
+        UID: ${HOST_UID}
       context: ./web
     depends_on:
       - db
-      - redis
+      - mq
     env_file: .env
     image: nopaque/web
     restart: unless-stopped
     volumes:
-      - "./logs:/home/nopaque/logs"
-      - "${NOPAQUE_STORAGE}:${NOPAQUE_STORAGE}"
-  daemon:
+      - "${NOPAQUE_DATA_DIR:-/mnt/nopaque}:${NOPAQUE_DATA_DIR:-/mnt/nopaque}"
+      - "${HOST_NOPAQUE_LOG_FILE-./nopaque.log}:${NOPAQUE_LOG_FILE:-/home/nopaque/nopaque.log}"
+  nopaqued:
     build:
       args:
-        DOCKER_GID: ${DOCKER_GID}
-        GID: ${GID}
-        UID: ${UID}
+        DOCKER_GID: ${HOST_DOCKER_GID}
+        GID: ${HOST_GID}
+        UID: ${HOST_UID}
       context: ./daemon
     depends_on:
       - db
-      - web
+      - nopaque
     env_file: .env
     image: nopaque/daemon
     restart: unless-stopped
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
-      - "./logs:/home/nopaqued/logs"
-      - "${NOPAQUE_STORAGE}:${NOPAQUE_STORAGE}"
+      - "${NOPAQUE_DATA_DIR:-/mnt/nopaque}:${NOPAQUE_DATA_DIR:-/mnt/nopaque}"
+      - "${HOST_NOPAQUE_DAEMON_LOG_FILE-./nopaqued.log}:${NOPAQUE_DAEMON_LOG_FILE:-/home/nopaqued/nopaqued.log}"
   db:
-    env_file: .env
+    environment:
+      - POSTGRES_DB_NAME=${NOPAQUE_DB_NAME}
+      - POSTGRES_USER=${NOPAQUE_DB_USERNAME}
+      - POSTGRES_PASSWORD=${NOPAQUE_DB_PASSWORD}
     image: postgres:11
     restart: unless-stopped
     volumes:
-      - "/srv/nopaque/db:/var/lib/postgresql/data"
-  redis:
+      - "${HOST_DB_DIR:-./db}:/var/lib/postgresql/data"
+  mq:
     image: redis:6
     restart: unless-stopped
     volumes:
-      - "redis-trash1:/data"
+      - "${HOST_MQ_DIR:-./mq}:/data"