From bf7af2e54a0c4d888590932acc757f4eeb0016d8 Mon Sep 17 00:00:00 2001
From: Robin Dittmar <robindittmar@gmail.com>
Date: Wed, 8 Nov 2023 01:22:24 +0100
Subject: [PATCH] moved to docker.dittmar.dev, since docker cli does not really
 allow custom paths in URIs

---
 data/nginx/include/dittmar.dev        |  8 -------
 data/nginx/include/docker.dittmar.dev | 30 +++++++++++++++++++++++++++
 init-certificates.sh                  |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 data/nginx/include/docker.dittmar.dev

diff --git a/data/nginx/include/dittmar.dev b/data/nginx/include/dittmar.dev
index b29d56f..d9e261d 100644
--- a/data/nginx/include/dittmar.dev
+++ b/data/nginx/include/dittmar.dev
@@ -39,14 +39,6 @@ server {
         proxy_pass http://10.222.0.2:80/;
     }
 
-    location /docker {
-        return 302 /docker/;
-    }
-    location /docker/ {
-        proxy_set_header Host $host;
-        proxy_pass http://registry:5000/;
-    }
-
     location /trilium {
         return 302 /trilium/;
     }
diff --git a/data/nginx/include/docker.dittmar.dev b/data/nginx/include/docker.dittmar.dev
new file mode 100644
index 0000000..7b364a4
--- /dev/null
+++ b/data/nginx/include/docker.dittmar.dev
@@ -0,0 +1,30 @@
+server {
+    listen 80;
+    server_name docker.dittmar.dev;
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
+
+    location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name docker.dittmar.dev;
+
+    ssl_certificate /etc/letsencrypt/live/dittmar.dev/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/dittmar.dev/privkey.pem;
+
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+
+        proxy_pass http://registry:5000;
+    }
+}
diff --git a/init-certificates.sh b/init-certificates.sh
index b467ebb..f075ed1 100755
--- a/init-certificates.sh
+++ b/init-certificates.sh
@@ -8,7 +8,7 @@ fi
 
 certbot_path="./data/certbot"
 rsa_key_size=4096
-domains=(dittmar.dev git.dittmar.dev cantropee.dittmar.dev)
+domains=(dittmar.dev git.dittmar.dev docker.dittmar.dev cantropee.dittmar.dev)
 email="robindittmar@gmail.com" # Adding a valid address is strongly recommended
 staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits