From d3a3225ea75f2be0d57b48fc21d1611b03cfae3e Mon Sep 17 00:00:00 2001
From: Benjamin Salzberg <besrasal@gmail.com>
Date: Sun, 28 Apr 2024 07:59:35 +0000
Subject: [PATCH] Add handling of custom ports (might not work for caddy)

---
 configure-instance.sh             | 2 ++
 template/config.properties        | 2 +-
 template/docker-compose.caddy.yml | 6 +++++-
 template/docker-compose.nginx.yml | 9 +++++++--
 template/pipedapi.conf            | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/configure-instance.sh b/configure-instance.sh
index 52e39d0..649a687 100755
--- a/configure-instance.sh
+++ b/configure-instance.sh
@@ -3,6 +3,7 @@ echo "Enter a hostname for the Frontend (eg: piped.kavin.rocks):" && read -r fro
 echo "Enter a hostname for the Backend (eg: pipedapi.kavin.rocks):" && read -r backend
 echo "Enter a hostname for the Proxy (eg: pipedproxy.kavin.rocks):" && read -r proxy
 echo "Enter the reverse proxy you would like to use (either caddy or nginx):" && read -r reverseproxy
+echo "Enter a port to use for the reverse proxy:" && read -r port
 
 rm -rf config/
 rm -f docker-compose.yml
@@ -12,5 +13,6 @@ cp -r template/ config/
 sed -i "s/FRONTEND_HOSTNAME/$frontend/g" config/*
 sed -i "s/BACKEND_HOSTNAME/$backend/g" config/*
 sed -i "s/PROXY_HOSTNAME/$proxy/g" config/*
+sed -i "s/PORT_VALUE/$port/g" config/*
 
 mv config/docker-compose.$reverseproxy.yml docker-compose.yml
diff --git a/template/config.properties b/template/config.properties
index ef1686f..d1a5c88 100644
--- a/template/config.properties
+++ b/template/config.properties
@@ -1,5 +1,5 @@
 # The port to Listen on.
-PORT: 8080
+PORT: PORT_VALUE
 
 # The number of workers to use for the server
 HTTP_WORKERS: 2
diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml
index ebb6637..fb4fc63 100644
--- a/template/docker-compose.caddy.yml
+++ b/template/docker-compose.caddy.yml
@@ -24,6 +24,8 @@ services:
         depends_on:
             - postgres
         container_name: piped-backend
+        environment:
+          - PORT=PORT_VALUE
     nginx:
         image: nginx:mainline-alpine
         restart: unless-stopped
@@ -31,13 +33,15 @@ services:
             - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
             - ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
         container_name: nginx
+        environment:
+          - PORT=PORT_VALUE
         depends_on:
             - piped
     caddy:
         image: caddy:2-alpine
         restart: unless-stopped
         ports:
-            - "80:80"
+            - "PORT_VALUE:80"
             - "443:443"
             - "443:443/udp"
         volumes:
diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml
index 2610282..d27bfbb 100644
--- a/template/docker-compose.nginx.yml
+++ b/template/docker-compose.nginx.yml
@@ -24,11 +24,13 @@ services:
         depends_on:
             - postgres
         container_name: piped-backend
+        environment:
+          - PORT=PORT_VALUE
     nginx:
         image: nginx:mainline-alpine
         restart: unless-stopped
         ports:
-            - "8080:80"
+            - "PORT_VALUE:80"
         volumes:
             - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
             - ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
@@ -45,7 +47,10 @@ services:
             - "traefik.enable=true"
             - "traefik.http.routers.piped.rule=Host(`FRONTEND_HOSTNAME`, `BACKEND_HOSTNAME`, `PROXY_HOSTNAME`)"
             - "traefik.http.routers.piped.entrypoints=websecure"
-            - "traefik.http.services.piped.loadbalancer.server.port=8080"
+            - "traefik.http.services.piped.loadbalancer.server.port=PORT_VALUE"
+        environment:
+          - PORT=PORT_VALUE
+
     postgres:
         image: postgres:15
         restart: unless-stopped
diff --git a/template/pipedapi.conf b/template/pipedapi.conf
index 69db81f..9d6c5fa 100644
--- a/template/pipedapi.conf
+++ b/template/pipedapi.conf
@@ -4,7 +4,7 @@ server {
     listen 80;
     server_name BACKEND_HOSTNAME;
 
-    set $backend "http://piped:8080";
+    set $backend "http://piped:PORT_VALUE";
 
     location / {
         proxy_cache pipedapi;