From 781774d4b9855390b9b59218de6ff7d0f53626da Mon Sep 17 00:00:00 2001
From: solrac200 <40304645+solrac200@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:31:27 +0100
Subject: [PATCH 1/4] Load Network Config depending on NETWORK_ACCESS

Instead of just differentiating between internal and external use the value of NETWORK_ACCESS as the used config file
---
 nginx.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index e8a555d..7e8cb22 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -52,9 +52,9 @@
 
 {{ define "location" }}
 	location {{ .Path }} {
-	{{ if eq .NetworkTag "internal" }}
+	{{ if ne .NetworkTag "external" }}
 		# Only allow traffic from internal clients
-		include /etc/nginx/network_internal.conf;
+		include {{ (printf "/etc/nginx/networks/%s.conf" .NetworkTag) }};
 	{{ end }}
 
 	{{ if eq .Proto "uwsgi" }}

From 5732ab25be6b3eec91db0f85cb461400637e5e85 Mon Sep 17 00:00:00 2001
From: solrac200 <40304645+solrac200@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:36:04 +0100
Subject: [PATCH 2/4] Update comment

---
 nginx.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.tmpl b/nginx.tmpl
index 7e8cb22..646053b 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -53,7 +53,7 @@
 {{ define "location" }}
 	location {{ .Path }} {
 	{{ if ne .NetworkTag "external" }}
-		# Only allow traffic from internal clients
+		# Allow traffic according of the given network config
 		include {{ (printf "/etc/nginx/networks/%s.conf" .NetworkTag) }};
 	{{ end }}
 

From 9e3815193211888065dbbf15fc6630e20023e402 Mon Sep 17 00:00:00 2001
From: solrac200 <40304645+solrac200@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:37:15 +0100
Subject: [PATCH 3/4] move network_internal inside folder

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dcd0285..47837ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
 COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
 COPY --from=dockergen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
-COPY network_internal.conf /etc/nginx/
+COPY network_internal.conf /etc/nginx/networks/
 
 COPY app nginx.tmpl LICENSE /app/
 WORKDIR /app/

From 496a782ab432d61c66f6771102980aca2f4c6c42 Mon Sep 17 00:00:00 2001
From: solrac200 <40304645+solrac200@users.noreply.github.com>
Date: Tue, 8 Nov 2022 01:43:19 +0100
Subject: [PATCH 4/4] Fix filename of internal network config

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 47837ec..a4d7b6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
 COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
 COPY --from=dockergen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
-COPY network_internal.conf /etc/nginx/networks/
+COPY network_internal.conf /etc/nginx/networks/internal.conf
 
 COPY app nginx.tmpl LICENSE /app/
 WORKDIR /app/