From 63d52c7bf90f70758b99153af55c018929656a01 Mon Sep 17 00:00:00 2001
From: gw3000 <weissenbaeck@posteo.de>
Date: Sun, 30 Jul 2023 19:25:24 +0200
Subject: [PATCH] Traefik in its own directory

---
 .gitignore                                       |  4 ++--
 docker-compose.prod.yml                          |  8 ++++----
 docker-compose.yaml                              | 11 ++++++++---
 Dockerfile.traefik => traefik/Dockerfile.traefik |  0
 traefik.dev.toml => traefik/traefik.dev.toml     |  0
 traefik.prod.toml => traefik/traefik.prod.toml   |  0
 6 files changed, 14 insertions(+), 9 deletions(-)
 rename Dockerfile.traefik => traefik/Dockerfile.traefik (100%)
 rename traefik.dev.toml => traefik/traefik.dev.toml (100%)
 rename traefik.prod.toml => traefik/traefik.prod.toml (100%)

diff --git a/.gitignore b/.gitignore
index fe740bd..9d0a3f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,8 +172,8 @@ style=""
 traefik-public-certificates
 
 # Postgres Data
-postgres_data
-postgres_backup
+postgres/backup
+postgres/data
 
 # Prestatic Collections
 app/staticfiles
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 3a48667..7ce97f5 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -32,8 +32,8 @@ services:
   db:
     image: postgres:15-alpine
     volumes:
-      - ./postgres_data:/var/lib/postgresql/data/
-      - ./postgres_backup:/backup
+      - ./postgres/data:/var/lib/postgresql/data/
+      - ./postgres/backup:/backup
     expose:
       - 5432
     environment:
@@ -43,13 +43,13 @@ services:
   traefik:
     build:
       context: .
-      dockerfile: Dockerfile.traefik
+      dockerfile: ./traefik/Dockerfile.traefik
     ports:
       - 80:80
       - 443:443
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./traefik-public-certificates:/certificates"
+      - "./traefik/traefik-public-certificates:/certificates"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.dashboard.rule=Host(`dashboard-fbf.nabu-jena.de`)"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1793200..76fa798 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,6 +22,11 @@ services:
       - "DB_PORT=${DB_PORT}"
       - "DB_USER=${DB_USER}"
       - "SECRET_KEY=${SECRET_KEY}"
+      - "DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL}"
+      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}"
+      - "EMAIL_HOST_USER=${EMAIL_HOST_USER}"
+      - "EMAIL_HOST=${EMAIL_HOST}"
+      - "EMAIL_PORT=${EMAIL_PORT}"
     depends_on:
       - db
     labels:
@@ -30,8 +35,8 @@ services:
   db:
     image: postgres:15-alpine
     volumes:
-      - ./postgres_data:/var/lib/postgresql/data/
-      - ./postgres_backup:/backup
+      - ./postgres/data:/var/lib/postgresql/data/
+      - ./postgres/backup:/backup
     expose:
       - 5432
     environment:
@@ -44,7 +49,7 @@ services:
       - 8008:80
       - 8081:8080
     volumes:
-      - "$PWD/traefik.dev.toml:/etc/traefik/traefik.toml"
+      - "./traefik/traefik.dev.toml:/etc/traefik/traefik.toml"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
 volumes:
diff --git a/Dockerfile.traefik b/traefik/Dockerfile.traefik
similarity index 100%
rename from Dockerfile.traefik
rename to traefik/Dockerfile.traefik
diff --git a/traefik.dev.toml b/traefik/traefik.dev.toml
similarity index 100%
rename from traefik.dev.toml
rename to traefik/traefik.dev.toml
diff --git a/traefik.prod.toml b/traefik/traefik.prod.toml
similarity index 100%
rename from traefik.prod.toml
rename to traefik/traefik.prod.toml