From fbdf91efbb866fb87a42428e45a0f4d4a6db1054 Mon Sep 17 00:00:00 2001 From: Davide Date: Mon, 30 Sep 2024 12:12:10 +0200 Subject: [PATCH] Removed Nginx proxy --- rp/.env.template | 3 - rp/README.md | 1 - rp/conf.d/stub.conf.template | 12 ---- rp/docker-compose.yml | 78 ----------------------- rp/htpasswd/netdata.domain.tld | 6 -- rp/vhost.d/fireflyiii.domain.tld_location | 10 --- rp/vhost.d/netdata.domain.tld_location | 16 ----- rp/vhost.d/vaultwarden.domain.tld | 16 ----- 8 files changed, 142 deletions(-) delete mode 100644 rp/.env.template delete mode 100644 rp/README.md delete mode 100644 rp/conf.d/stub.conf.template delete mode 100644 rp/docker-compose.yml delete mode 100644 rp/htpasswd/netdata.domain.tld delete mode 100644 rp/vhost.d/fireflyiii.domain.tld_location delete mode 100644 rp/vhost.d/netdata.domain.tld_location delete mode 100644 rp/vhost.d/vaultwarden.domain.tld diff --git a/rp/.env.template b/rp/.env.template deleted file mode 100644 index c1f5bdb..0000000 --- a/rp/.env.template +++ /dev/null @@ -1,3 +0,0 @@ -# Simple reverse proxy project name to simplify network referencing. -COMPOSE_PROJECT_NAME=rp -DEFAULT_EMAIL="" diff --git a/rp/README.md b/rp/README.md deleted file mode 100644 index 8b13789..0000000 --- a/rp/README.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/rp/conf.d/stub.conf.template b/rp/conf.d/stub.conf.template deleted file mode 100644 index 9cd4188..0000000 --- a/rp/conf.d/stub.conf.template +++ /dev/null @@ -1,12 +0,0 @@ -# File to place in the conf/ directory of Nginx, to give other containers the -# capability of accessing Nginx status - -server { - listen ${proxy-container-name}:80; - server_name ${proxy-container-name}; - location /nginx_status { - stub_status on; - allow all; - access_log on; - } -} diff --git a/rp/docker-compose.yml b/rp/docker-compose.yml deleted file mode 100644 index 1244d33..0000000 --- a/rp/docker-compose.yml +++ /dev/null @@ -1,78 +0,0 @@ -x-logging: - &default-logging - driver: syslog - options: - # This requires two files in /etc/rsyslog.d - # https://www.loggly.com/use-cases/docker-syslog-logging-and-troubleshooting/ - tag: "container_name/{{.Name}}" - labels: "${hostname}" - syslog-facility: # cron, local7, etc. - -# Can be removed if not needed -x-opt-values: - &volume-opt - driver_opts: &options - type: "nfs" - o: "addr=${IP},rw" - -services: - nginx-proxy: - image: jwilder/nginx-proxy - container_name: proxy - labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" - ports: - - "80:80" - - "443:443" - restart: always - volumes: - - conf:/etc/nginx/conf.d - - vhost:/etc/nginx/vhost.d - - passwords:/etc/nginx/htpasswd - - html:/usr/share/nginx/html - - certs:/etc/nginx/certs:ro - - /var/run/docker.sock:/tmp/docker.sock:ro - networks: - - reverse-proxy - logging: *default-logging - - letsencrypt: - image: nginxproxy/acme-companion - container_name: letsencrypt - restart: always - volumes: - - conf:/etc/nginx/conf.d - - vhost:/etc/nginx/vhost.d - - html:/usr/share/nginx/html - - certs:/etc/nginx/certs:rw - - acme:/etc/acme.sh - - /var/run/docker.sock:/var/run/docker.sock:ro - environment: - NGINX_PROXY_CONTAINER: proxy - DEFAULT_EMAIL: ${DEFAULT_EMAIL} - networks: - - reverse-proxy - logging: *default-logging - -networks: - reverse-proxy: - -volumes: - acme: - certs: - conf: - html: - passwords: - vhost: - -# What if I want to use the x-opt-values: -# acme: -# <<: *volume-opt -# driver_opts: -# <<: *options -# device: ":/mnt/path/nginx-proxy/acme" -# o: "new_opts" -# type: "new_type" -# -# 'o' and 'type' can be redifined again or left at default - diff --git a/rp/htpasswd/netdata.domain.tld b/rp/htpasswd/netdata.domain.tld deleted file mode 100644 index 8812ac7..0000000 --- a/rp/htpasswd/netdata.domain.tld +++ /dev/null @@ -1,6 +0,0 @@ -# https://learn.netdata.cloud/docs/agent/running-behind-nginx#enable-authentication -# Putting username and hashed password inside the htpasswd folder of -# jwilder/nginx-proxy activates the Basic auth for the domain you -# use as the filename of this file. - -${username}:${hashed-password} diff --git a/rp/vhost.d/fireflyiii.domain.tld_location b/rp/vhost.d/fireflyiii.domain.tld_location deleted file mode 100644 index 750030d..0000000 --- a/rp/vhost.d/fireflyiii.domain.tld_location +++ /dev/null @@ -1,10 +0,0 @@ -# https://docs.firefly-iii.org/firefly-iii/installation/docker/ -# In the section "Docker and reverse proxies", this is suggested for Nginx. -# Put it in the vhost.d/ folder, with your domain and _location at the end -# as a filename. - -proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-Forwarded-Host $host; -proxy_set_header X-Forwarded-Server $host; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header Host $host; diff --git a/rp/vhost.d/netdata.domain.tld_location b/rp/vhost.d/netdata.domain.tld_location deleted file mode 100644 index 4fabf22..0000000 --- a/rp/vhost.d/netdata.domain.tld_location +++ /dev/null @@ -1,16 +0,0 @@ -# https://learn.netdata.cloud/docs/agent/running-behind-nginx#ways-to-access-netdata-via-nginx -# Content suggested by Netdata documentation, excluding declarations that will -# be automatically populated by jwilder/nginx-proxy. -# To be placed in the vhost.d folder of Nginx, remember to put your domain as -# the filename with _location at the end. - -proxy_set_header X-Forwarded-Host $host; -proxy_set_header X-Forwarded-Server $host; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_pass_request_headers on; -proxy_set_header Connection "keep-alive"; -proxy_store off; - -gzip on; -gzip_proxied any; -gzip_types *; diff --git a/rp/vhost.d/vaultwarden.domain.tld b/rp/vhost.d/vaultwarden.domain.tld deleted file mode 100644 index a258f4f..0000000 --- a/rp/vhost.d/vaultwarden.domain.tld +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for the routes of Vaultwarden. To be placed in the vhost.d/ -# folder of Nginx, substitute the name of the file with your domain. - -location /admin { - return 404; -} - -location /notifications/hub { - proxy_pass http://${vaultwarden-container-name}:3012; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} - -location /notifications/hub/negotiate { - proxy_pass http://${vaultwarden-container-name}:8080; -}