From 52b19a8d11d9f298055a0273dcb9f24001d11215 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 1 Nov 2022 00:33:20 -0700
Subject: [PATCH] #36 for Jdownloader

---
 homelab/server/config/jdownloader2/.env         | 17 -----------------
 .../config/jdownloader2/docker-compose.yml      |  2 ++
 .../server/config/jdownloader2/jdownloader2.env |  6 ++++++
 homelab/server/config/jdownloader2/project.env  |  0
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 homelab/server/config/jdownloader2/.env
 create mode 100644 homelab/server/config/jdownloader2/jdownloader2.env
 delete mode 100644 homelab/server/config/jdownloader2/project.env

diff --git a/homelab/server/config/jdownloader2/.env b/homelab/server/config/jdownloader2/.env
deleted file mode 100644
index 229b4edd..00000000
--- a/homelab/server/config/jdownloader2/.env
+++ /dev/null
@@ -1,17 +0,0 @@
-DOCKER_DATA=/home/joey/data/jdownloader2
-DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
-#USER_ID=1000
-#GROUP_ID=1000
-#SUP_GROUP_IDS=
-#UMASK=
-TZ=America/Los_Angeles
-#KEEP_APP_RUNNING=0
-#APP_NICENESS=
-#CLEAN_TMP_DIR=1
-#DISPLAY_WIDTH=1280
-#DISPLAY_HEIGHT=768
-#SECURE_CONNECTION=0
-#VNC_PASSWORD=
-#X11VNC_EXTRA_OPTS=
-#ENABLE_CJK_FONT=0
-#INSTALL_EXTRA_PKGS=
\ No newline at end of file
diff --git a/homelab/server/config/jdownloader2/docker-compose.yml b/homelab/server/config/jdownloader2/docker-compose.yml
index 37cc0f2e..498520c1 100644
--- a/homelab/server/config/jdownloader2/docker-compose.yml
+++ b/homelab/server/config/jdownloader2/docker-compose.yml
@@ -13,6 +13,8 @@ services:
         keep-file: "true"
     networks:
       - web
+    env_file:
+      - jdownloader2.env
     volumes:
       - "$DOCKER_DATA:/config:rw"
       - "$DOWNLOAD_DIR:/output:rw"
diff --git a/homelab/server/config/jdownloader2/jdownloader2.env b/homelab/server/config/jdownloader2/jdownloader2.env
new file mode 100644
index 00000000..efe8a383
--- /dev/null
+++ b/homelab/server/config/jdownloader2/jdownloader2.env
@@ -0,0 +1,6 @@
+# Volumes
+DOCKER_DATA=/home/joey/data/jdownloader2
+DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
+
+# Env
+TZ=America/Los_Angeles
\ No newline at end of file
diff --git a/homelab/server/config/jdownloader2/project.env b/homelab/server/config/jdownloader2/project.env
deleted file mode 100644
index e69de29b..00000000