From 4dd72c3eb49f5af75cf860042554939dbe664d1d Mon Sep 17 00:00:00 2001
From: faulty <didier@faulty.nl>
Date: Wed, 1 Feb 2023 11:41:16 +0100
Subject: [PATCH] mod: custom image; forgor ; before

---
 custom/proxy/config/vhost.d/default       |  4 ++--
 docker-compose.base.yml                   |  6 ++----
 files/backups/global.json                 |  4 ----
 files/backups/tasks/generic_services.json | 16 ----------------
 files/backups/tasks/kasmc.json            | 11 -----------
 files/backups/tasks/smpxmc.json           | 11 -----------
 6 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 files/backups/global.json
 delete mode 100644 files/backups/tasks/generic_services.json
 delete mode 100644 files/backups/tasks/kasmc.json
 delete mode 100644 files/backups/tasks/smpxmc.json

diff --git a/custom/proxy/config/vhost.d/default b/custom/proxy/config/vhost.d/default
index 7ec945b..4b1d424 100644
--- a/custom/proxy/config/vhost.d/default
+++ b/custom/proxy/config/vhost.d/default
@@ -10,7 +10,7 @@ location ^~ /.well-known/acme-challenge/ {
 ## End of configuration add by letsencrypt container
 
 
-location ^~ /_/nginx {
+location /_/nginx {
     add_header Content-Type text/html;
-    return 200 "Nginx is working..."
+    return 200 "Nginx is working...";
 }
\ No newline at end of file
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 424f6f6..c9d3787 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -7,7 +7,8 @@ networks:
 
 services:
   proxy:
-    image: nginxproxy/nginx-proxy:latest 
+    build: 
+      context: custom/proxy
     container_name: proxy
     restart: always
     privileged: true
@@ -16,10 +17,7 @@ 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
-      - /srv/proxy/config/nginx.conf:/etc/nginx/nginx.conf
       - /var/run/docker.sock:/tmp/docker.sock
     labels:
       - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true
diff --git a/files/backups/global.json b/files/backups/global.json
deleted file mode 100644
index 6b89115..0000000
--- a/files/backups/global.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "remote_dir": "/remote",
-    "tasks_dir": "/config/tasks"
-}
\ No newline at end of file
diff --git a/files/backups/tasks/generic_services.json b/files/backups/tasks/generic_services.json
deleted file mode 100644
index ad585d2..0000000
--- a/files/backups/tasks/generic_services.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "name": "GenericServices",
-    "interval": 86400,
-    "base": "/services",
-    "paths": [
-        ".webcerts",
-        "proxy",
-        "jellyfin",
-        "ghost",
-        "gitlab",
-        "searx"
-    ],
-    "local_days_of_retention": 1,
-    "remote_days_of_retention": 30,
-    "backup_dir": "/local"
-}
\ No newline at end of file
diff --git a/files/backups/tasks/kasmc.json b/files/backups/tasks/kasmc.json
deleted file mode 100644
index 060ccb3..0000000
--- a/files/backups/tasks/kasmc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "KasMC",
-    "interval": 604800,
-    "base": "/services/kasmc",
-    "paths": [
-        "data"
-    ],
-    "local_days_of_retention": 7,
-    "remote_days_of_retention": 14,
-    "backup_dir": "/local"
-}
\ No newline at end of file
diff --git a/files/backups/tasks/smpxmc.json b/files/backups/tasks/smpxmc.json
deleted file mode 100644
index b7478f8..0000000
--- a/files/backups/tasks/smpxmc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "SMPXMC",
-  "interval": 86400,
-  "base": "/services/smpxmc",
-  "paths": [
-    "data"
-  ],
-  "local_days_of_retention": 7,
-  "remote_days_of_retention": 30,
-  "backup_dir": "/local"
-}
\ No newline at end of file