From de5634dd58020d0011b3fe9e9a31c02597538d45 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Tue, 1 Nov 2022 00:35:15 -0700
Subject: [PATCH] #36 for Stashapp

---
 homelab/server/config/stashapp/.env               |  3 ---
 homelab/server/config/stashapp/docker-compose.yml |  7 ++-----
 homelab/server/config/stashapp/project.env        |  0
 homelab/server/config/stashapp/stashapp.env       | 10 ++++++++++
 4 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 homelab/server/config/stashapp/.env
 delete mode 100644 homelab/server/config/stashapp/project.env
 create mode 100644 homelab/server/config/stashapp/stashapp.env

diff --git a/homelab/server/config/stashapp/.env b/homelab/server/config/stashapp/.env
deleted file mode 100644
index c8f43a88..00000000
--- a/homelab/server/config/stashapp/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-MEDIA_DIR=/mnt/nas/av/
-METADATA_DIR=/mnt/md0/
-DOCKER_DATA=/home/joey/data/stash
\ No newline at end of file
diff --git a/homelab/server/config/stashapp/docker-compose.yml b/homelab/server/config/stashapp/docker-compose.yml
index af323ee4..14ca6c24 100644
--- a/homelab/server/config/stashapp/docker-compose.yml
+++ b/homelab/server/config/stashapp/docker-compose.yml
@@ -20,11 +20,8 @@ services:
       - $MEDIA_DIR/Videos:/media/Videos
       - $MEDIA_DIR/Galleries:/media/Galleries
       - $DOCKER_DATA:/root/.stash
-    environment:
-      - STASH_STASH=/media/
-      - STASH_GENERATED=/generated/
-      - STASH_METADATA=/metadata/
-      - STASH_CACHE=/cache/
+    env_file:
+      - stashapp.env
     networks:
       - web
     labels:
diff --git a/homelab/server/config/stashapp/project.env b/homelab/server/config/stashapp/project.env
deleted file mode 100644
index e69de29b..00000000
diff --git a/homelab/server/config/stashapp/stashapp.env b/homelab/server/config/stashapp/stashapp.env
new file mode 100644
index 00000000..4bce97d1
--- /dev/null
+++ b/homelab/server/config/stashapp/stashapp.env
@@ -0,0 +1,10 @@
+# Volumes
+MEDIA_DIR=/mnt/nas/av/
+METADATA_DIR=/mnt/md0/
+DOCKER_DATA=/home/joey/data/stash
+
+# Env
+STASH_STASH=/media/
+STASH_GENERATED=/generated/
+STASH_METADATA=/metadata/
+STASH_CACHE=/cache/
\ No newline at end of file