From 531c677c9831420c045e8270e97d752ae5b3d851 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Tue, 7 Jan 2025 21:03:08 +0100 Subject: [PATCH] feat: support for hosting only via http using configure-instance.sh --- configure-instance.sh | 2 ++ template/config.properties | 6 +++--- template/docker-compose.caddy.yml | 1 + template/docker-compose.nginx.yml | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure-instance.sh b/configure-instance.sh index 5e594fd..3791f3f 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 "Is your hostname reachable via HTTP or HTTPS? (eg: https)" && read -r http_mode rm -rf config/ rm -f docker-compose.yml @@ -15,5 +16,6 @@ sed -i "s/BACKEND_HOSTNAME/$backend/g" $conffiles sed -i "s/PROXY_HOSTNAME/$proxy/g" $conffiles sed -i "s/BACKEND_HOSTNAME_PLACEHOLDER/$backend/g" config/*.yml +sed -i "s/HTTP_MODE_PLACEHOLDER/$http_mode/g" config/*.yml mv config/docker-compose.$reverseproxy.yml docker-compose.yml diff --git a/template/config.properties b/template/config.properties index ba573bc..209c279 100644 --- a/template/config.properties +++ b/template/config.properties @@ -5,7 +5,7 @@ PORT: 8080 HTTP_WORKERS: 2 # Proxy -PROXY_PART: https://PROXY_HOSTNAME +PROXY_PART: HTTP_MODE_PLACEHOLDER://PROXY_HOSTNAME # Outgoing HTTP Proxy - eg: 127.0.0.1:8118 #HTTP_PROXY: 127.0.0.1:8118 @@ -15,10 +15,10 @@ CAPTCHA_BASE_URL: https://api.capmonster.cloud/ CAPTCHA_API_KEY: INSERT_HERE # Public API URL -API_URL: https://BACKEND_HOSTNAME +API_URL: HTTP_MODE_PLACEHOLDER://BACKEND_HOSTNAME # Public Frontend URL -FRONTEND_URL: https://FRONTEND_HOSTNAME +FRONTEND_URL: HTTP_MODE_PLACEHOLDER://FRONTEND_HOSTNAME # Enable haveibeenpwned compromised password API COMPROMISED_PASSWORD_CHECK: true diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml index 57c78fe..57d2488 100644 --- a/template/docker-compose.caddy.yml +++ b/template/docker-compose.caddy.yml @@ -6,6 +6,7 @@ services: - piped environment: BACKEND_HOSTNAME: BACKEND_HOSTNAME_PLACEHOLDER + HTTP_MODE: HTTP_MODE_PLACEHOLDER container_name: piped-frontend piped-proxy: image: 1337kavin/piped-proxy:latest diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml index 2ad6d67..1745563 100644 --- a/template/docker-compose.nginx.yml +++ b/template/docker-compose.nginx.yml @@ -6,6 +6,7 @@ services: - piped environment: BACKEND_HOSTNAME: BACKEND_HOSTNAME_PLACEHOLDER + HTTP_MODE: HTTP_MODE_PLACEHOLDER container_name: piped-frontend piped-proxy: image: 1337kavin/piped-proxy:latest