From e9f5dcb952d9613bbd8213c34a6b8afb956b4efb Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Fri, 30 Oct 2020 15:24:09 -0400
Subject: [PATCH] Added configuration customization ability to location
directories.
---
swarm-proxy-letsencrypt/Dockerfile | 1 +
swarm-proxy-letsencrypt/app/letsencrypt_service | 4 ++++
swarm-proxy/Dockerfile | 7 +++++++
swarm-proxy/swarm-proxy.conf.tmpl | 3 +++
4 files changed, 15 insertions(+)
diff --git a/swarm-proxy-letsencrypt/Dockerfile b/swarm-proxy-letsencrypt/Dockerfile
index c54af19..88576d8 100644
--- a/swarm-proxy-letsencrypt/Dockerfile
+++ b/swarm-proxy-letsencrypt/Dockerfile
@@ -52,6 +52,7 @@ RUN rm -f /docker-run.d/nginx-run.sh && \
mkdir -p /etc/nginx/dhparam && \
mkdir -p /etc/nginx/conf.d && \
mkdir -p /etc/nginx/vhost.d && \
+ mkdir -p /etc/nginx/loc.d && \
mkdir -p /usr/share/nginx/html/.well-known/acme-challenge/
VOLUME ["/etc/nginx/certs", "/etc/nginx/dhparam", "/etc/nginx/conf.d", "/etc/nginx/vhost.d", "/usr/share/nginx/html"]
diff --git a/swarm-proxy-letsencrypt/app/letsencrypt_service b/swarm-proxy-letsencrypt/app/letsencrypt_service
index f3fbc86..ec47680 100755
--- a/swarm-proxy-letsencrypt/app/letsencrypt_service
+++ b/swarm-proxy-letsencrypt/app/letsencrypt_service
@@ -347,6 +347,10 @@ server {
include /etc/nginx/vhost.d/default*;
location / {
+ include /etc/nginx/loc.d/${LE_HOST}-https-*;
+ include /etc/nginx/loc.d/${LE_HOST}-all-*;
+ include /etc/nginx/loc.d/default*;
+
proxy_pass http://${LE_HOST}_upstream;
}
}
diff --git a/swarm-proxy/Dockerfile b/swarm-proxy/Dockerfile
index 9c1b813..ef644bc 100644
--- a/swarm-proxy/Dockerfile
+++ b/swarm-proxy/Dockerfile
@@ -18,6 +18,13 @@ COPY swarm-proxy.conf.tmpl /etc/swarm-gen/templates/
COPY https-routing.conf.tmpl /etc/swarm-gen/templates/
COPY 01-copy-default-entry.sh /docker-entrypoint.d/
+
+RUN mkdir -p /etc/nginx/certs && \
+ mkdir -p /etc/nginx/dhparam && \
+ mkdir -p /etc/nginx/conf.d && \
+ mkdir -p /etc/nginx/vhost.d && \
+ mkdir -p /etc/nginx/loc.d
+
VOLUME ["/etc/nginx/certs", "/etc/nginx/dhparam", "/etc/nginx/conf.d", "/etc/nginx/vhost.d", "/etc/nginx/serv.d", "/usr/share/nginx/html"]
ENV DOCKER_HOST unix:///var/run/docker.sock
diff --git a/swarm-proxy/swarm-proxy.conf.tmpl b/swarm-proxy/swarm-proxy.conf.tmpl
index 0d057ec..cbf11e1 100644
--- a/swarm-proxy/swarm-proxy.conf.tmpl
+++ b/swarm-proxy/swarm-proxy.conf.tmpl
@@ -11,6 +11,9 @@ server {
include /etc/nginx/vhost.d/default*;
location / {
+ include /etc/nginx/loc.d/${LE_HOST}-http-*;
+ include /etc/nginx/loc.d/${LE_HOST}-all-*;
+ include /etc/nginx/loc.d/default*;
proxy_pass http://${HOST}_upstream;
}
}
--
GitLab