From 3380c7abf8c14a6b36e4933332e1824c8c777074 Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sat, 28 Sep 2024 17:15:37 -0400
Subject: [PATCH 1/6] Add nginx-module-vts

---
 scripts/build-openresty | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/build-openresty b/scripts/build-openresty
index 9f3a1bb..c95cf24 100755
--- a/scripts/build-openresty
+++ b/scripts/build-openresty
@@ -14,6 +14,8 @@ tar -xzf openresty-${OPENRESTY_VERSION}.tar.gz
 mv /tmp/openresty-${OPENRESTY_VERSION} /tmp/openresty
 git clone https://github.com/leev/ngx_http_geoip2_module.git
 mv /tmp/ngx_http_geoip2_module /tmp/openresty/ngx_http_geoip2_module
+git clone https://github.com/vozlt/nginx-module-vts.git
+mv /tmp/nginx-module-vts /tmp/openresty/nginx-module-vts
 cd /tmp/openresty
 
 ./configure \
@@ -55,6 +57,7 @@ cd /tmp/openresty
 	--with-stream_realip_module \
 	--with-stream_ssl_module \
 	--with-stream_ssl_preread_module \
+	--add-module=/tmp/openresty/nginx-module-vts \
 	--add-dynamic-module=/tmp/openresty/ngx_http_geoip2_module
 
 make -j2

From 20235dbc229678bfee465ecdeb704af0326cbf0e Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sat, 28 Sep 2024 17:28:58 -0400
Subject: [PATCH 2/6] Comment other builds to only create certbot-node

---
 local-buildx.sh | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/local-buildx.sh b/local-buildx.sh
index dbf2862..6be1b40 100755
--- a/local-buildx.sh
+++ b/local-buildx.sh
@@ -7,7 +7,7 @@ GREEN='\E[1;32m'
 RESET='\E[0m'
 
 DOCKER_IMAGE="${REGISTRY:-}nginxproxymanager/nginx-full"
-PLATFORMS=linux/amd64,linux/arm64,linux/arm/7
+PLATFORMS=linux/arm64
 
 export OPENRESTY_VERSION=1.25.3.2
 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7
@@ -22,7 +22,7 @@ export ACMESH_GOLANG_IMAGE="${DOCKER_IMAGE}:acmesh-golang"
 
 # Setup
 
-docker buildx rm "${BUILDX_NAME:-nginx-full}" || echo
+# docker buildx rm "${BUILDX_NAME:-nginx-full}" || echo
 docker buildx create --name "${BUILDX_NAME:-nginx-full}" || echo
 docker buildx use "${BUILDX_NAME:-nginx-full}"
 
@@ -33,7 +33,6 @@ docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
 	--pull \
-	--push \
 	--build-arg OPENRESTY_VERSION \
 	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \
 	--build-arg LUA_VERSION \
@@ -42,46 +41,45 @@ docker buildx build \
 	-f docker/Dockerfile \
 	.
 
-echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}"
-docker buildx build \
-	--platform "$PLATFORMS" \
-	--progress plain \
-	--push \
-	--build-arg BASE_IMAGE \
-	-t "$ACMESH_IMAGE" \
-	-f docker/Dockerfile.acmesh \
-	.
+# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}"
+# docker buildx build \
+# 	--platform "$PLATFORMS" \
+# 	--progress plain \
+# 	--push \
+# 	--build-arg BASE_IMAGE \
+# 	-t "$ACMESH_IMAGE" \
+# 	-f docker/Dockerfile.acmesh \
+# 	.
 
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}"
 docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
-	--push \
 	--build-arg BASE_IMAGE \
 	-t "$CERTBOT_IMAGE" \
 	-f docker/Dockerfile.certbot \
 	.
 
-echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}"
-docker buildx build \
-	--platform "$PLATFORMS" \
-	--progress plain \
-	--push \
-	--build-arg ACMESH_IMAGE \
-	-t "$ACMESH_GOLANG_IMAGE" \
-	-f docker/Dockerfile.acmesh-golang \
-	.
+# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}"
+# docker buildx build \
+# 	--platform "$PLATFORMS" \
+# 	--progress plain \
+# 	--push \
+# 	--build-arg ACMESH_IMAGE \
+# 	-t "$ACMESH_GOLANG_IMAGE" \
+# 	-f docker/Dockerfile.acmesh-golang \
+# 	.
 
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}"
 docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
-	--push \
+	--load \
 	--build-arg CERTBOT_IMAGE \
 	-t "$CERTBOT_NODE_IMAGE" \
 	-f docker/Dockerfile.certbot-node \
 	.
 
-docker buildx rm "${BUILDX_NAME:-nginx-full}"
+# docker buildx rm "${BUILDX_NAME:-nginx-full}"
 
 echo -e "${BLUE}❯ ${GREEN}All done!${RESET}"

From f8ad8166e1766e39d73e47d79250e3f4ba3e3aeb Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sun, 29 Sep 2024 21:12:29 -0400
Subject: [PATCH 3/6] Fix nginx script

---
 scripts/fix-nginx.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 scripts/fix-nginx.sh

diff --git a/scripts/fix-nginx.sh b/scripts/fix-nginx.sh
new file mode 100644
index 0000000..ed77d86
--- /dev/null
+++ b/scripts/fix-nginx.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+mkdir -p var/log/nginx
+touch var/log/nginx/error.log
+
+useradd -s /bin/false nginx
+
+mkdir -p /var/cache/nginx/client_temp
+
+apt update && apt install -y vim
+
+vim /etc/nginx/nginx.conf
+
+# vhost_traffic_status_zone;
+
+# location /status {
+#     vhost_traffic_status_display;
+#     vhost_traffic_status_display_format html;
+# }
\ No newline at end of file

From 272a4f2992623db1957552a4da1c57bbf6d4c4fc Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sun, 29 Sep 2024 21:13:20 -0400
Subject: [PATCH 4/6] Comment out unwanted versions

---
 local-build.sh | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/local-build.sh b/local-build.sh
index 4b1e94e..3448cd6 100755
--- a/local-build.sh
+++ b/local-build.sh
@@ -23,40 +23,40 @@ export ACMESH_GOLANG_IMAGE="${DOCKER_IMAGE}:acmesh-golang"
 # Builds
 
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}latest ${CYAN}...${RESET}"
-docker build \
+sudo docker build \
 	--pull \
-	--build-arg OPENRESTY_VERSION \
-	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \
-	--build-arg LUA_VERSION \
-	--build-arg LUAROCKS_VERSION \
+	--build-arg OPENRESTY_VERSION=$OPENRESTY_VERSION \
+	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION=$CROWDSEC_OPENRESTY_BOUNCER_VERSION \
+	--build-arg LUA_VERSION=$LUA_VERSION \
+	--build-arg LUAROCKS_VERSION=$LUAROCKS_VERSION \
 	-t "$BASE_IMAGE" \
 	-f docker/Dockerfile \
 	.
 
-echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}"
-docker build \
-	--build-arg BASE_IMAGE \
-	-t "$ACMESH_IMAGE" \
-	-f docker/Dockerfile.acmesh \
-	.
+# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}"
+# docker build \
+# 	--build-arg BASE_IMAGE \
+# 	-t "$ACMESH_IMAGE" \
+# 	-f docker/Dockerfile.acmesh \
+#	.
 
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}"
-docker build \
-	--build-arg BASE_IMAGE \
+sudo docker build \
+	--build-arg BASE_IMAGE=$BASE_IMAGE \
 	-t "$CERTBOT_IMAGE" \
 	-f docker/Dockerfile.certbot \
 	.
 
-echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}"
-docker build \
-	--build-arg ACMESH_IMAGE \
-	-t "$ACMESH_GOLANG_IMAGE" \
-	-f docker/Dockerfile.acmesh-golang \
-	.
+# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}"
+# docker build \
+# 	--build-arg ACMESH_IMAGE \
+# 	-t "$ACMESH_GOLANG_IMAGE" \
+# 	-f docker/Dockerfile.acmesh-golang \
+# 	.
 
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}"
-docker build \
-	--build-arg CERTBOT_IMAGE \
+sudo docker build \
+	--build-arg CERTBOT_IMAGE=$CERTBOT_IMAGE \
 	-t "$CERTBOT_NODE_IMAGE" \
 	-f docker/Dockerfile.certbot-node \
 	.

From d3724f7af4f5f8528d0044a2cfb68f49e0551e8c Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sun, 29 Sep 2024 21:13:32 -0400
Subject: [PATCH 5/6] temp fix buildx

---
 local-buildx.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/local-buildx.sh b/local-buildx.sh
index 6be1b40..89f7eff 100755
--- a/local-buildx.sh
+++ b/local-buildx.sh
@@ -33,10 +33,11 @@ docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
 	--pull \
-	--build-arg OPENRESTY_VERSION \
-	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \
-	--build-arg LUA_VERSION \
-	--build-arg LUAROCKS_VERSION \
+	--load \
+	--build-arg OPENRESTY_VERSION=$OPENRESTY_VERSION \
+	--build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION=$CROWDSEC_OPENRESTY_BOUNCER_VERSION \
+	--build-arg LUA_VERSION=$LUA_VERSION \
+	--build-arg LUAROCKS_VERSION=$LUAROCKS_VERSION \
 	-t "$BASE_IMAGE" \
 	-f docker/Dockerfile \
 	.
@@ -55,7 +56,9 @@ echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}"
 docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
-	--build-arg BASE_IMAGE \
+	--load \
+	--no-cache \
+	--build-arg BASE_IMAGE=$BASE_IMAGE \
 	-t "$CERTBOT_IMAGE" \
 	-f docker/Dockerfile.certbot \
 	.
@@ -75,7 +78,8 @@ docker buildx build \
 	--platform "$PLATFORMS" \
 	--progress plain \
 	--load \
-	--build-arg CERTBOT_IMAGE \
+	--no-cache \
+	--build-arg CERTBOT_IMAGE=$CERTBOT_IMAGE \
 	-t "$CERTBOT_NODE_IMAGE" \
 	-f docker/Dockerfile.certbot-node \
 	.

From 8919ed5aab516e32d2592449431fa297a24f2868 Mon Sep 17 00:00:00 2001
From: Kevin Toms <kevinpunnoor@gmail.com>
Date: Sun, 29 Sep 2024 21:30:59 -0400
Subject: [PATCH 6/6] Update certbot-node tagname

---
 local-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-build.sh b/local-build.sh
index 3448cd6..2fe3332 100755
--- a/local-build.sh
+++ b/local-build.sh
@@ -57,7 +57,7 @@ sudo docker build \
 echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}"
 sudo docker build \
 	--build-arg CERTBOT_IMAGE=$CERTBOT_IMAGE \
-	-t "$CERTBOT_NODE_IMAGE" \
+	-t "kustom-local-nginx-full:certbot-node" \
 	-f docker/Dockerfile.certbot-node \
 	.