From 633468a98043b03c37a5005c317431a227d6de01 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Tue, 1 Nov 2022 12:12:57 -0700 Subject: [PATCH] #36 Update for volume logic issue --- homelab/server/config/autopirate/.env | 5 +++++ homelab/server/config/autopirate/autopirate.env | 8 -------- homelab/server/config/calibre-web/.env | 1 + homelab/server/config/calibre-web/calibre-web.env | 4 ---- homelab/server/config/fireshare/.env | 3 +++ homelab/server/config/fireshare/fireshare.env | 6 ------ homelab/server/config/gitlab/{gitlab.env => .env} | 1 - homelab/server/config/gitlab/docker-compose.yml | 4 ---- homelab/server/config/jdownloader2/.env | 2 ++ homelab/server/config/jdownloader2/jdownloader2.env | 5 ----- homelab/server/config/keycloak/.env | 1 + homelab/server/config/keycloak/keycloak.env | 4 ---- .../server/config/megan-portfolio/{project.env => .env} | 1 - homelab/server/config/megan-portfolio/docker-compose.yml | 2 -- homelab/server/config/minecraft/.env | 2 ++ homelab/server/config/minecraft/minecraft.env | 5 ----- homelab/server/config/monitoring/{monitoring.env => .env} | 1 - homelab/server/config/monitoring/docker-compose.yml | 8 +------- homelab/server/config/plex/.env | 2 ++ homelab/server/config/plex/plex_stack.env | 5 ----- homelab/server/config/qbittorrent/.env | 2 ++ homelab/server/config/qbittorrent/qbittorrent.env | 5 ----- homelab/server/config/send/.env | 1 + homelab/server/config/send/send.env | 4 ---- homelab/server/config/sftp/{sftp.env => .env} | 0 homelab/server/config/sftp/docker-compose.yml | 2 -- homelab/server/config/stashapp/.env | 3 +++ homelab/server/config/stashapp/stashapp.env | 6 ------ homelab/server/config/traefik/{traefik.env => .env} | 0 homelab/server/config/traefik/docker-compose.yml | 2 -- homelab/server/config/unifi_controller/.env | 1 + .../server/config/unifi_controller/unifi_controller.env | 4 ---- homelab/server/config/wireguard/.env | 1 + homelab/server/config/wireguard/wireguard.env | 4 ---- 34 files changed, 25 insertions(+), 80 deletions(-) create mode 100644 homelab/server/config/autopirate/.env create mode 100644 homelab/server/config/calibre-web/.env create mode 100644 homelab/server/config/fireshare/.env rename homelab/server/config/gitlab/{gitlab.env => .env} (88%) create mode 100644 homelab/server/config/jdownloader2/.env create mode 100644 homelab/server/config/keycloak/.env rename homelab/server/config/megan-portfolio/{project.env => .env} (81%) create mode 100644 homelab/server/config/minecraft/.env rename homelab/server/config/monitoring/{monitoring.env => .env} (79%) create mode 100644 homelab/server/config/plex/.env create mode 100644 homelab/server/config/qbittorrent/.env create mode 100644 homelab/server/config/send/.env rename homelab/server/config/sftp/{sftp.env => .env} (100%) create mode 100644 homelab/server/config/stashapp/.env rename homelab/server/config/traefik/{traefik.env => .env} (100%) create mode 100644 homelab/server/config/unifi_controller/.env create mode 100644 homelab/server/config/wireguard/.env diff --git a/homelab/server/config/autopirate/.env b/homelab/server/config/autopirate/.env new file mode 100644 index 00000000..e74c4303 --- /dev/null +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/autopirate/autopirate.env b/homelab/server/config/autopirate/autopirate.env index 21bec4fa..58e58df6 100644 --- a/homelab/server/config/autopirate/autopirate.env +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/calibre-web/.env b/homelab/server/config/calibre-web/.env new file mode 100644 index 00000000..baaa2263 --- /dev/null +++ b/homelab/server/config/calibre-web/.env @@ -0,0 +1 @@ +LIBRARY_DIR=/mnt/nas/calibre-web \ No newline at end of file diff --git a/homelab/server/config/calibre-web/calibre-web.env b/homelab/server/config/calibre-web/calibre-web.env index e448031f..248f7ce8 100644 --- a/homelab/server/config/calibre-web/calibre-web.env +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/fireshare/.env b/homelab/server/config/fireshare/.env new file mode 100644 index 00000000..c244e317 --- /dev/null +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/fireshare/fireshare.env b/homelab/server/config/fireshare/fireshare.env index 0f7ec402..01fd258a 100644 --- a/homelab/server/config/fireshare/fireshare.env +++ b/homelab/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 diff --git a/homelab/server/config/gitlab/gitlab.env b/homelab/server/config/gitlab/.env similarity index 88% rename from homelab/server/config/gitlab/gitlab.env rename to homelab/server/config/gitlab/.env index 63060ddd..96d7bf54 100644 --- a/homelab/server/config/gitlab/gitlab.env +++ b/homelab/server/config/gitlab/.env @@ -1,3 +1,2 @@ -# Volumes DOCKER_DATA=/home/joey/data/gitlab DOCKER_CONFIG=/home/joey/docker_config/gitlab \ No newline at end of file diff --git a/homelab/server/config/gitlab/docker-compose.yml b/homelab/server/config/gitlab/docker-compose.yml index 2417f902..3cbc55a5 100644 --- a/homelab/server/config/gitlab/docker-compose.yml +++ b/homelab/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 diff --git a/homelab/server/config/jdownloader2/.env b/homelab/server/config/jdownloader2/.env new file mode 100644 index 00000000..68d3733d --- /dev/null +++ b/homelab/server/config/jdownloader2/.env @@ -0,0 +1,2 @@ +DOCKER_DATA=/home/joey/data/jdownloader2 +DOWNLOAD_DIR=/mnt/nas/torrenting/jdownloader2 \ No newline at end of file diff --git a/homelab/server/config/jdownloader2/jdownloader2.env b/homelab/server/config/jdownloader2/jdownloader2.env index efe8a383..4a5fde13 100644 --- a/homelab/server/config/jdownloader2/jdownloader2.env +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/keycloak/.env b/homelab/server/config/keycloak/.env new file mode 100644 index 00000000..bafbbae4 --- /dev/null +++ b/homelab/server/config/keycloak/.env @@ -0,0 +1 @@ +KEYCLOAK_DATA="/home/joey/data/keycloak/data" \ No newline at end of file diff --git a/homelab/server/config/keycloak/keycloak.env b/homelab/server/config/keycloak/keycloak.env index 328418f0..9bdb2175 100644 --- a/homelab/server/config/keycloak/keycloak.env +++ b/homelab/server/config/keycloak/keycloak.env @@ -1,5 +1 @@ -# Volumes -KEYCLOAK_DATA="/home/joey/data/keycloak/data" - -# Env KEYCLOAK_ADMIN="jafner" \ No newline at end of file diff --git a/homelab/server/config/megan-portfolio/project.env b/homelab/server/config/megan-portfolio/.env similarity index 81% rename from homelab/server/config/megan-portfolio/project.env rename to homelab/server/config/megan-portfolio/.env index aa48f19f..754e6606 100644 --- a/homelab/server/config/megan-portfolio/project.env +++ b/homelab/server/config/megan-portfolio/.env @@ -1,2 +1 @@ -# Volumes DOCKER_DATA=/home/joey/data/megan-portfolio \ No newline at end of file diff --git a/homelab/server/config/megan-portfolio/docker-compose.yml b/homelab/server/config/megan-portfolio/docker-compose.yml index f5733cc0..58d678d6 100644 --- a/homelab/server/config/megan-portfolio/docker-compose.yml +++ b/homelab/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 diff --git a/homelab/server/config/minecraft/.env b/homelab/server/config/minecraft/.env new file mode 100644 index 00000000..f5cd4f3c --- /dev/null +++ b/homelab/server/config/minecraft/.env @@ -0,0 +1,2 @@ +DOCKER_DATA=/mnt/md0/minecraft +DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft \ No newline at end of file diff --git a/homelab/server/config/minecraft/minecraft.env b/homelab/server/config/minecraft/minecraft.env index 141de6ef..b908c1d0 100644 --- a/homelab/server/config/minecraft/minecraft.env +++ b/homelab/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 diff --git a/homelab/server/config/monitoring/monitoring.env b/homelab/server/config/monitoring/.env similarity index 79% rename from homelab/server/config/monitoring/monitoring.env rename to homelab/server/config/monitoring/.env index 049d22de..32c75a00 100644 --- a/homelab/server/config/monitoring/monitoring.env +++ b/homelab/server/config/monitoring/.env @@ -1,2 +1 @@ -# Volumes DOCKER_DATA=/home/joey/data/monitoring \ No newline at end of file diff --git a/homelab/server/config/monitoring/docker-compose.yml b/homelab/server/config/monitoring/docker-compose.yml index f0dfa5dc..0e0ad958 100644 --- a/homelab/server/config/monitoring/docker-compose.yml +++ b/homelab/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: diff --git a/homelab/server/config/plex/.env b/homelab/server/config/plex/.env new file mode 100644 index 00000000..05ab340b --- /dev/null +++ b/homelab/server/config/plex/.env @@ -0,0 +1,2 @@ +DOCKER_DATA=/home/joey/data/plex +MEDIA_DIR=/mnt/nas/media \ No newline at end of file diff --git a/homelab/server/config/plex/plex_stack.env b/homelab/server/config/plex/plex_stack.env index 1c95a194..248f7ce8 100644 --- a/homelab/server/config/plex/plex_stack.env +++ b/homelab/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 \ No newline at end of file diff --git a/homelab/server/config/qbittorrent/.env b/homelab/server/config/qbittorrent/.env new file mode 100644 index 00000000..7e891692 --- /dev/null +++ b/homelab/server/config/qbittorrent/.env @@ -0,0 +1,2 @@ +DOCKER_DATA=/home/joey/data/qbittorrent +TORRENT_DATA=/mnt/nas/torrenting \ No newline at end of file diff --git a/homelab/server/config/qbittorrent/qbittorrent.env b/homelab/server/config/qbittorrent/qbittorrent.env index 5031a738..b3c97e31 100644 --- a/homelab/server/config/qbittorrent/qbittorrent.env +++ b/homelab/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 diff --git a/homelab/server/config/send/.env b/homelab/server/config/send/.env new file mode 100644 index 00000000..d9f7c048 --- /dev/null +++ b/homelab/server/config/send/.env @@ -0,0 +1 @@ +DOCKER_DATA=/home/joey/data/send \ No newline at end of file diff --git a/homelab/server/config/send/send.env b/homelab/server/config/send/send.env index c0257e0c..99529cf4 100644 --- a/homelab/server/config/send/send.env +++ b/homelab/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 diff --git a/homelab/server/config/sftp/sftp.env b/homelab/server/config/sftp/.env similarity index 100% rename from homelab/server/config/sftp/sftp.env rename to homelab/server/config/sftp/.env diff --git a/homelab/server/config/sftp/docker-compose.yml b/homelab/server/config/sftp/docker-compose.yml index e6f981a2..f9a594df 100644 --- a/homelab/server/config/sftp/docker-compose.yml +++ b/homelab/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: diff --git a/homelab/server/config/stashapp/.env b/homelab/server/config/stashapp/.env new file mode 100644 index 00000000..c8f43a88 --- /dev/null +++ b/homelab/server/config/stashapp/.env @@ -0,0 +1,3 @@ +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/stashapp.env b/homelab/server/config/stashapp/stashapp.env index 4bce97d1..c139ab86 100644 --- a/homelab/server/config/stashapp/stashapp.env +++ b/homelab/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/ diff --git a/homelab/server/config/traefik/traefik.env b/homelab/server/config/traefik/.env similarity index 100% rename from homelab/server/config/traefik/traefik.env rename to homelab/server/config/traefik/.env diff --git a/homelab/server/config/traefik/docker-compose.yml b/homelab/server/config/traefik/docker-compose.yml index 773e1e5f..679a4ed6 100644 --- a/homelab/server/config/traefik/docker-compose.yml +++ b/homelab/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 diff --git a/homelab/server/config/unifi_controller/.env b/homelab/server/config/unifi_controller/.env new file mode 100644 index 00000000..24003df0 --- /dev/null +++ b/homelab/server/config/unifi_controller/.env @@ -0,0 +1 @@ +DOCKER_DATA=/home/joey/data/unifi_controller \ No newline at end of file diff --git a/homelab/server/config/unifi_controller/unifi_controller.env b/homelab/server/config/unifi_controller/unifi_controller.env index 30ae4db1..a705f72e 100644 --- a/homelab/server/config/unifi_controller/unifi_controller.env +++ b/homelab/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 diff --git a/homelab/server/config/wireguard/.env b/homelab/server/config/wireguard/.env new file mode 100644 index 00000000..ae1bcc2d --- /dev/null +++ b/homelab/server/config/wireguard/.env @@ -0,0 +1 @@ +DOCKER_DATA=/home/joey/data/wireguard \ No newline at end of file diff --git a/homelab/server/config/wireguard/wireguard.env b/homelab/server/config/wireguard/wireguard.env index eadf8fe2..6abe064e 100644 --- a/homelab/server/config/wireguard/wireguard.env +++ b/homelab/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 \ No newline at end of file