From 20ca920de92e7781135a3fd463e92d281508a046 Mon Sep 17 00:00:00 2001
From: faulty <didier@faulty.nl>
Date: Wed, 15 Feb 2023 14:00:28 +0100
Subject: [PATCH] instead just disabled redirect git

---
 custom/proxy/config/conf.d/redirect-git.conf | 40 ++++++++++----------
 docker-compose.base.yml                      |  9 +----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/custom/proxy/config/conf.d/redirect-git.conf b/custom/proxy/config/conf.d/redirect-git.conf
index 97cb587..3f0562b 100644
--- a/custom/proxy/config/conf.d/redirect-git.conf
+++ b/custom/proxy/config/conf.d/redirect-git.conf
@@ -1,20 +1,20 @@
-server {
-    listen 80;
-    server_name "git.faulty.nl";
-    return 301 https://git.ixvd.net$request_uri;
-}
-server {
-    server_name git.faulty.nl;
-    access_log /var/log/nginx/access.log vhost;
-    listen 443 ssl http2 ;
-    ssl_session_timeout 5m;
-    ssl_session_cache shared:SSL:50m;
-    ssl_session_tickets off;
-    ssl_certificate /etc/nginx/certs/git.faulty.nl.crt;
-    ssl_certificate_key /etc/nginx/certs/git.faulty.nl.key;
-    ssl_dhparam /etc/nginx/certs/git.faulty.nl.dhparam.pem;
-    ssl_stapling on;
-    ssl_stapling_verify on;
-    ssl_trusted_certificate /etc/nginx/certs/git.faulty.nl.chain.pem;
-    return 301 https://git.ixvd.net$request_uri;
-}
\ No newline at end of file
+# server {
+#     listen 80;
+#     server_name "git.faulty.nl";
+#     return 301 https://git.ixvd.net$request_uri;
+# }
+# server {
+#     server_name git.faulty.nl;
+#     access_log /var/log/nginx/access.log vhost;
+#     listen 443 ssl http2 ;
+#     ssl_session_timeout 5m;
+#     ssl_session_cache shared:SSL:50m;
+#     ssl_session_tickets off;
+#     ssl_certificate /etc/nginx/certs/git.faulty.nl.crt;
+#     ssl_certificate_key /etc/nginx/certs/git.faulty.nl.key;
+#     ssl_dhparam /etc/nginx/certs/git.faulty.nl.dhparam.pem;
+#     ssl_trusted_certificate /etc/nginx/certs/git.faulty.nl.chain.pem;
+#     ssl_stapling on;
+#     ssl_stapling_verify on;
+#     return 301 https://git.ixvd.net$request_uri;
+# }
\ No newline at end of file
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index fbca4ef..b49e36d 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -7,9 +7,8 @@ networks:
 
 services:
   proxy:
-    # build: 
-    #   context: custom/proxy
-    image: nginxproxy/nginx-proxy
+    build: 
+      context: custom/proxy
     container_name: proxy
     restart: always
     privileged: true
@@ -18,8 +17,6 @@ services:
       - 443:443
     volumes:
       - /srv/.webcerts:/etc/nginx/certs:rw
-      - /srv/proxy/config/conf.d:/etc/nginx/conf.d
-      - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d
       - /srv/proxy/data/html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock
     labels:
@@ -35,8 +32,6 @@ services:
       - proxy
     volumes:
       - /srv/.webcerts:/etc/nginx/certs:rw
-      - /srv/proxy/config/conf.d:/etc/nginx/conf.d
-      - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d
       - /srv/proxy/data/html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment: