#36 Update for volume logic issue

2022-11-01 12:12:57 -07:00 · 2022-11-01 12:12:57 -07:00 · 306bd8d132
commit 306bd8d132
parent ef7da5ce08
34 changed files with 25 additions and 80 deletions
--- a/server/config/autopirate/.env
+++ b/server/config/autopirate/.env
@ -0,0 +1,5 @@
+DOCKER_DATA=/home/joey/data/autopirate
+MEDIA_DIR=/mnt/nas/media
+NZB_DIR=/mnt/md0/torrenting/NZB
+INCOMPLETE_NZB_DIR=/mnt/md0/torrenting/NZB_incomplete
+TRANSCODE_DIR=/mnt/md0/tdarr
--- a/server/config/autopirate/autopirate.env
+++ b/server/config/autopirate/autopirate.env
@ -1,11 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/autopirate
-MEDIA_DIR=/mnt/nas/media
-NZB_DIR=/mnt/md0/torrenting/NZB
-INCOMPLETE_NZB_DIR=/mnt/md0/torrenting/NZB_incomplete
-TRANSCODE_DIR=/mnt/md0/tdarr
-
-## Env
 TZ=America/Los_Angeles
 PUID=1000
 PGID=1000
--- a/server/config/calibre-web/.env
+++ b/server/config/calibre-web/.env
@ -0,0 +1 @@
+LIBRARY_DIR=/mnt/nas/calibre-web
--- a/server/config/calibre-web/calibre-web.env
+++ b/server/config/calibre-web/calibre-web.env
@ -1,7 +1,3 @@
-# Volumes
-LIBRARY_DIR=/mnt/nas/calibre-web
-
-# Env
 PUID=1000
 PGID=1000
 TZ=America/Los_Angeles
--- a/server/config/fireshare/.env
+++ b/server/config/fireshare/.env
@ -0,0 +1,3 @@
+VIDEO_DIR=/mnt/nas/media/Video/Recordings/Fireshare
+DATA_DIR=/home/joey/data/fireshare/db
+PROCESSED_DIR=/home/joey/data/fireshare/metadata
--- a/server/config/fireshare/fireshare.env
+++ b/server/config/fireshare/fireshare.env
@ -1,9 +1,3 @@
-# Volumes
-VIDEO_DIR=/mnt/nas/media/Video/Recordings/Fireshare
-DATA_DIR=/home/joey/data/fireshare/db
-PROCESSED_DIR=/home/joey/data/fireshare/metadata
-
-# Env
 ADMIN_USERNAME=joey
 MINUTES_BETWEEN_VIDEO_SCANS=10
 PUID=1000
--- a/server/config/gitlab/gitlab.env
+++ b/server/config/gitlab/gitlab.env
@ -1,3 +1,2 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/gitlab
 DOCKER_CONFIG=/home/joey/docker_config/gitlab
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@ -15,8 +15,6 @@ services:
    hostname: 'gitlab.jafner.net'
    networks:
      - web
-    env_file:
-      - gitlab.env
    environment:
      GITLAB_OMNIBUS_CONFIG: |
        external_url 'https://gitlab.jafner.net'
@ -106,7 +104,6 @@ services:
        keep-file: "true"
    restart: "no"
    env_file:
-      - gitlab.env
      - runner.env
    volumes:
      - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
@ -127,7 +124,6 @@ services:
        keep-file: "true"
    restart: "no"
    env_file:
-      - gitlab.env
      - runner.env
    volumes:
      - ${DOCKER_DATA}/runner-config:/etc/gitlab-runner
--- a/server/config/jdownloader2/.env
+++ b/server/config/jdownloader2/.env
@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/jdownloader2
+DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
--- a/server/config/jdownloader2/jdownloader2.env
+++ b/server/config/jdownloader2/jdownloader2.env
@ -1,6 +1 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/jdownloader2
-DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2
-
-# Env
 TZ=America/Los_Angeles
--- a/server/config/keycloak/.env
+++ b/server/config/keycloak/.env
@ -0,0 +1 @@
+KEYCLOAK_DATA="/home/joey/data/keycloak/data"
--- a/server/config/keycloak/keycloak.env
+++ b/server/config/keycloak/keycloak.env
@ -1,5 +1 @@
-# Volumes
-KEYCLOAK_DATA="/home/joey/data/keycloak/data"
-
-# Env
 KEYCLOAK_ADMIN="jafner"
--- a/server/config/megan-portfolio/project.env
+++ b/server/config/megan-portfolio/project.env
@ -1,2 +1 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/megan-portfolio
--- a/server/config/megan-portfolio/docker-compose.yml
+++ b/server/config/megan-portfolio/docker-compose.yml
@ -6,7 +6,6 @@ services:
    container_name: wordpress_megan-portfolio
    restart: "no"
    env_file:
-      - project.env
      - megan-portfolio.env
    volumes:
      - ${DOCKER_DATA}/html:/var/www/html
@ -27,7 +26,6 @@ services:
    networks:
      - portfolio
    env_file:
-      - project.env
      - megan-portfolio-db.env
    volumes:
      - ${DOCKER_DATA}/db:/var/lib/mysql
--- a/server/config/minecraft/.env
+++ b/server/config/minecraft/.env
@ -0,0 +1,2 @@
+DOCKER_DATA=/mnt/md0/minecraft
+DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
--- a/server/config/minecraft/minecraft.env
+++ b/server/config/minecraft/minecraft.env
@ -1,8 +1,3 @@
-# Volumes
-DOCKER_DATA=/mnt/md0/minecraft
-DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
-
-# Env
 EULA=TRUE
 OPS=jafner425,mollymsmom,galaxysqvid
 ENABLE_RCON=true
--- a/server/config/monitoring/monitoring.env
+++ b/server/config/monitoring/monitoring.env
@ -1,2 +1 @@
-# Volumes
 DOCKER_DATA=/home/joey/data/monitoring
--- a/server/config/monitoring/docker-compose.yml
+++ b/server/config/monitoring/docker-compose.yml
@ -16,8 +16,6 @@ services:
      - monitoring
      - web
    user: "0"
-    env_file:
-      - monitoring.env
    volumes:  
      - ${DOCKER_DATA}/grafana:/var/lib/grafana
      - ./custom.ini:/etc/grafana/grafana.ini
@ -43,8 +41,6 @@ services:
      - web
    ports:
      - 9090:9090
-    env_file:
-      - monitoring.env
    volumes:
      - ./prometheus.yml:/etc/prometheus/prometheus.yml
      - ${DOCKER_DATA}/prometheus:/prometheus
@ -73,8 +69,6 @@ services:
      - web
    ports:
      - "3100:3100"
-    env_file:
-      - monitoring.env
    volumes:
      - ${DOCKER_DATA}/loki-logs:/loki-logs
      - ./loki-config.yml:/etc/loki/loki-config.yml # not sure if this works. If not, just edit the config within the data volume
@ -115,7 +109,7 @@ services:
        keep-file: "true"
    restart: "no"
    networks:
-      -   monitoring
+      - monitoring
    env_file:
      - exporter-pihole.env
    labels:
--- a/server/config/plex/.env
+++ b/server/config/plex/.env
@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/plex
+MEDIA_DIR=/mnt/nas/media
--- a/server/config/plex/plex_stack.env
+++ b/server/config/plex/plex_stack.env
@ -1,8 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/plex
-MEDIA_DIR=/mnt/nas/media
-
-# Env
 PUID=1000
 PGID=1000
 TZ=America/Los_Angeles
--- a/server/config/qbittorrent/.env
+++ b/server/config/qbittorrent/.env
@ -0,0 +1,2 @@
+DOCKER_DATA=/home/joey/data/qbittorrent
+TORRENT_DATA=/mnt/nas/torrenting
--- a/server/config/qbittorrent/qbittorrent.env
+++ b/server/config/qbittorrent/qbittorrent.env
@ -1,8 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/qbittorrent
-TORRENT_DATA=/mnt/nas/torrenting
-
-# Env
 PUID=1000
 PGID=1000
 TZ=America/Los_Angeles
--- a/server/config/send/.env
+++ b/server/config/send/.env
@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/send
--- a/server/config/send/send.env
+++ b/server/config/send/send.env
@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/send
-
-# Env
 VIRTUAL_HOST=0.0.0.0
 VIRTUAL_PORT=1234
 DHPARAM_GENERATION=false
--- a/server/config/sftp/sftp.env
+++ b/server/config/sftp/sftp.env
--- a/server/config/sftp/docker-compose.yml
+++ b/server/config/sftp/docker-compose.yml
@ -12,8 +12,6 @@ services:
        loki-timeout: "2s"
        keep-file: "true"
    restart: "no"
-    env_file:
-      - sftp.env
    ports:
      - 23450:22/tcp
    volumes:
--- a/server/config/stashapp/.env
+++ b/server/config/stashapp/.env
@ -0,0 +1,3 @@
+MEDIA_DIR=/mnt/nas/av/
+METADATA_DIR=/mnt/md0/
+DOCKER_DATA=/home/joey/data/stash
--- a/server/config/stashapp/stashapp.env
+++ b/server/config/stashapp/stashapp.env
@ -1,9 +1,3 @@
-# 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/
--- a/server/config/traefik/traefik.env
+++ b/server/config/traefik/traefik.env
--- a/server/config/traefik/docker-compose.yml
+++ b/server/config/traefik/docker-compose.yml
@ -13,8 +13,6 @@ services:
        loki-timeout: "2s"
        keep-file: "true"
    restart: "no"
-    env_file:
-      - traefik.env
    networks:
      - web
      - monitoring
--- a/server/config/unifi_controller/.env
+++ b/server/config/unifi_controller/.env
@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/unifi_controller
--- a/server/config/unifi_controller/unifi_controller.env
+++ b/server/config/unifi_controller/unifi_controller.env
@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/unifi_controller
-
-# Env
 PUID=1000
 PGID=1000
 MEM_LIMIT=1024M
--- a/server/config/wireguard/.env
+++ b/server/config/wireguard/.env
@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/wireguard
--- a/server/config/wireguard/wireguard.env
+++ b/server/config/wireguard/wireguard.env
@ -1,7 +1,3 @@
-# Volumes
-DOCKER_DATA=/home/joey/data/wireguard
-
-# Env
 WG_HOST=vpn.jafner.net
 WG_PORT=53820
 WG_DEFAULT_DNS=192.168.1.1
				`@ -0,0 +1 @@`
				`KEYCLOAK_DATA="/home/joey/data/keycloak/data"`
				`@ -0,0 +1 @@`
				`DOCKER_DATA=/home/joey/data/unifi_controller`