From a305f16ac20039cffb3a01c0642c71c893248302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 8 Sep 2023 14:14:06 +0200
Subject: [PATCH] Revert "caddy: set to default reverse proxy"

This reverts commit 165cc90af736f868c5074d5ddb5f06c17214eb80.
---
 docker-compose.yml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 22c5a5d..148cb97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,15 +32,11 @@ services:
     image: caddy
     container_name: caddy
     ports:
-      - "80:80"
-      - "443:443"
-      - "443:443/udp"
       - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}"
       - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}"
     user: ${PUID}
     volumes:
       - "${DOCKER_STORAGE_PATH}/caddy/config:/etc/caddy/"
-      - caddy_data:/data
       - "/www/notes:/srv/notes"
       - "timetracker-static:/srv/timetracker"
     networks:
@@ -619,6 +615,28 @@ services:
       - base
     restart: unless-stopped
 
+  npm:
+    container_name: nginx-proxy-manager
+    image: docker.io/jc21/nginx-proxy-manager:2.9.22
+    network_mode: host
+    # doesn't need to be in the mariadb network because it uses host mode
+    depends_on:
+      - mariadb
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/data:/data"
+      - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/letsencrypt:/etc/letsencrypt"
+      - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/98-themepark:/etc/cont-init.d/99-themepark"
+    environment:
+      - DB_MYSQL_HOST=localhost
+      - DB_MYSQL_NAME=npm
+      - DB_MYSQL_PASSWORD=npm
+      - "DB_MYSQL_PORT=${MARIADB_EXTERNAL_PORT}"
+      - DB_MYSQL_USER=npm
+    profiles:
+      - infra
+      - base
+    restart: unless-stopped
+
   photoprism:
     container_name: photoprism
     image: docker.io/photoprism/photoprism
@@ -730,5 +748,4 @@ networks:
     attachable: true
 
 volumes:
-  timetracker-static:
-  caddy_data:
\ No newline at end of file
+  timetracker-static:
\ No newline at end of file