Merge branch 'main' of http://192.168.1.50:3000/akanealw/dockerserver

2023-11-05 10:36:26 -06:00
parent 9fbc0d16ba b1f3c390f4
commit fe4d607681
4 changed files with 2 additions and 22 deletions
--- a/.env
+++ b/.env
@@ -13,6 +13,5 @@ TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
 BACKUP_DIR=/mnt/truenas-backups
-DATA_DIR=/mnt/truenas-data
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
--- a/admin/.env
+++ b/admin/.env
@@ -12,7 +12,6 @@ UMASK=000
 TZ=America/Chicago
 ADMIN_USERNAME=akanealw
 ADMIN_PASSWORD=8ung1e1!
-DATA_DIR=/mnt/truenas-data
-BACKUP_DIR=/mnt/truenas-data/backups
+BACKUP_DIR=/mnt/truenas-backups
 MEDIA_DIR=/mnt/truenas-media
 STORAGE_DIR=/mnt/truenas-storage
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
      - 8084:80/tcp
    restart: always
    volumes:
-      - ${DATA_DIR}:/HD:ro
+      - ${MEDIA_DIR}:/HD:ro
      - ${DOCKER_CONFIGS}/monitorr/app:/app
      - ${DOCKER_CONFIGS}/monitorr/config:/config
      - /etc/localtime:/etc/localtime:ro
--- a/gluetun/.env
+++ b/gluetun/.env
@@ -1,18 +0,0 @@
-#GLOBAL SETTINGS
-COMPOSE_HTTP_TIMEOUT=120
-COMPOSE_IGNORE_ORPHANS=1
-DOCKER_CONFIGS=./appdata
-DOCKERGID=999
-DOCKERHOSTNAME=DockerServer
-DOCKERLOGGING_MAXFILE=10
-DOCKERLOGGING_MAXSIZE=200k
-PGID=1000
-PUID=1000
-UMASK=000
-TZ=America/Chicago
-ADMIN_USERNAME=akanealw
-ADMIN_PASSWORD=8ung1e1!
-BACKUP_DIR=/mnt/truenas-backups
-DATA_DIR=/mnt/truenas-data
-MEDIA_DIR=/mnt/truenas-media
-STORAGE_DIR=/mnt/truenas-storage