From: cat æscling <11325618-aescling@users.noreply.gitlab.com>
Date: Sat, 5 Aug 2023 15:34:38 +0000 (-0400)
Subject: examples: fix: Fix redirect with hidden service
X-Git-Tag: v1.0.2~1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=287da83e16329f4ab0445ace6fdb5fb3a763f944;p=httpd-execline.git

examples: fix: Fix redirect with hidden service

This was simply a mistake. The indended architecture was always for the
HTTPS listener to reverse proxy to the local superserver. This acutally
makes it do that.
---

diff --git a/examples/https-with-redirect-and-with-hidden-service/httpd.execline/templates/run-https.execline b/examples/https-with-redirect-and-with-hidden-service/httpd.execline/templates/run-https.execline
index 771f4a7..33156af 100644
--- a/examples/https-with-redirect-and-with-hidden-service/httpd.execline/templates/run-https.execline
+++ b/examples/https-with-redirect-and-with-hidden-service/httpd.execline/templates/run-https.execline
@@ -4,14 +4,17 @@ s6-envdir data/env
 multisubstitute {
     importas -iu ip httpd_execline_ip
     importas -iu port httpd_execline_port
-    importas -iu httpd_execline_root httpd_execline_root
     importas -iu user httpd_execline_user_https
+    importas -iu local httpd_execline_unix_domain_superserver_location
+    importas -iu CERTFILE CERTFILE
+    importas -iu KEYFILE KEYFILE
 }
 emptyenv -p
 s6-envuidgid ${user}
+export CERTFILE ${CERTFILE}
+export KEYFILE ${KEYFILE}
 
-cd ${httpd_execline_root}
 s6-tlsserver -v -- ${ip} ${port}
     toybox timeout -v -i --foreground --preserve-status 60
-        getpid process_id
-        ./binaries/httpd.execline
+        s6-ipcclient ${local}
+            s6-ioconnect -67