[add] added support for custom nginx location config files
This commit is contained in:
@@ -17,16 +17,21 @@ services:
|
|||||||
image: proxy
|
image: proxy
|
||||||
container_name: proxy
|
container_name: proxy
|
||||||
ports:
|
ports:
|
||||||
- "80:8080"
|
- "9980:8080"
|
||||||
- "443:8443"
|
- "9443:8443"
|
||||||
networks:
|
networks:
|
||||||
- service_web
|
- service_web
|
||||||
- service_certbot
|
- service_certbot
|
||||||
|
- backend_proxy
|
||||||
volumes:
|
volumes:
|
||||||
# cert volume
|
# cert volume
|
||||||
- proxy_ssl:/service/ssl:ro
|
- proxy_ssl:/service/ssl:ro
|
||||||
# /.well-known/acme-challenge/ volume
|
# /.well-known/acme-challenge/ volume
|
||||||
- proxy_certbot:/service/html/certbot:ro
|
- proxy_certbot:/service/html/certbot:ro
|
||||||
|
# custom config mount
|
||||||
|
# can be used to set custom locations for upstream server
|
||||||
|
# has to have the same name as the upstream server to be loaded
|
||||||
|
- ./files/upstream_configs:/upstream_configs:ro
|
||||||
|
|
||||||
certbot:
|
certbot:
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -99,3 +104,6 @@ networks:
|
|||||||
name: service_web
|
name: service_web
|
||||||
service_certbot:
|
service_certbot:
|
||||||
name: service_certbot
|
name: service_certbot
|
||||||
|
backend_proxy:
|
||||||
|
name: backend_proxy
|
||||||
|
external: true
|
||||||
|
|||||||
13
files/upstream_configs/upstream.conf.example
Normal file
13
files/upstream_configs/upstream.conf.example
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
location / {
|
||||||
|
# allow for upstream to be offline by setting
|
||||||
|
# docker dns resolver and a variable for the server
|
||||||
|
resolver 127.0.0.11 valid=30s;
|
||||||
|
proxy_pass http://$upstream;
|
||||||
|
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Host $server_name;
|
||||||
|
proxy_set_header X-Forwarded-Upstream $upstream;
|
||||||
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
# global config
|
||||||
|
CONF_DIR="${CONF_DIR:-/upstream_configs}"
|
||||||
|
|
||||||
# configuration
|
# configuration
|
||||||
web_root_path="/service/html"
|
web_root_path="/service/html"
|
||||||
cert_root_path="/service/ssl"
|
cert_root_path="/service/ssl"
|
||||||
@@ -61,6 +64,11 @@ function get_element()
|
|||||||
echo $result
|
echo $result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# helper function to isolate server from port
|
||||||
|
function server_name()
|
||||||
|
{
|
||||||
|
echo -n ${1%:*}
|
||||||
|
}
|
||||||
# helper function to check if a string contains a substring in dash
|
# helper function to check if a string contains a substring in dash
|
||||||
function contains()
|
function contains()
|
||||||
{
|
{
|
||||||
@@ -171,6 +179,28 @@ function gen_server_config()
|
|||||||
done
|
done
|
||||||
|
|
||||||
local rng_number=$(rng)
|
local rng_number=$(rng)
|
||||||
|
|
||||||
|
local server_location="
|
||||||
|
location / {
|
||||||
|
# allow for upstream to be offline by setting
|
||||||
|
# docker dns resolver and a variable for the server
|
||||||
|
resolver 127.0.0.11 valid=30s;
|
||||||
|
proxy_pass http://\$upstream;
|
||||||
|
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_set_header Host \$host;
|
||||||
|
proxy_set_header X-Real-IP \$remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Host \$server_name;
|
||||||
|
proxy_set_header X-Forwarded-Upstream \$upstream;
|
||||||
|
}
|
||||||
|
"
|
||||||
|
|
||||||
|
# check if config file is mounted and use it in place of default location
|
||||||
|
local config_file="$CONF_DIR/$(server_name $server).conf"
|
||||||
|
[ -f "$config_file" ] \
|
||||||
|
&& server_location="include $config_file;"
|
||||||
|
|
||||||
local server_var="
|
local server_var="
|
||||||
server {
|
server {
|
||||||
listen 8443 ssl;
|
listen 8443 ssl;
|
||||||
@@ -185,21 +215,9 @@ function gen_server_config()
|
|||||||
|
|
||||||
ssl_certificate /service/ssl/$root_domain/fullchain.pem;
|
ssl_certificate /service/ssl/$root_domain/fullchain.pem;
|
||||||
ssl_certificate_key /service/ssl/$root_domain/privkey.pem;
|
ssl_certificate_key /service/ssl/$root_domain/privkey.pem;
|
||||||
set \$upstream $server;
|
set \$upstream $server$port;
|
||||||
|
|
||||||
location / {
|
$server_location
|
||||||
# allow for upstream to be offline by setting
|
|
||||||
# docker dns resolver and a variable for the server
|
|
||||||
resolver 127.0.0.11 valid=30s;
|
|
||||||
proxy_pass http://\$upstream$port;
|
|
||||||
|
|
||||||
proxy_redirect off;
|
|
||||||
proxy_set_header Host \$host;
|
|
||||||
proxy_set_header X-Real-IP \$remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Host \$server_name;
|
|
||||||
proxy_set_header X-Forwarded-Upstream \$upstream;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /0x90 {
|
location /0x90 {
|
||||||
ssi on;
|
ssi on;
|
||||||
|
|||||||
Reference in New Issue
Block a user