From 5032d5e9c885478876c0fc4a00767cdefcdbc2b4 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@pkgx.dev>
Date: Sun, 2 Jun 2024 01:26:21 -0400
Subject: [PATCH] fix(caddyserver)

closes #6269
---
 projects/caddyserver.com/package.yml | 33 +++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/projects/caddyserver.com/package.yml b/projects/caddyserver.com/package.yml
index aad086f2..049e0e80 100644
--- a/projects/caddyserver.com/package.yml
+++ b/projects/caddyserver.com/package.yml
@@ -19,33 +19,26 @@ provides:
 test:
   dependencies:
     curl.se: '*'
+    pkgx.sh: 1
+  env:
+    PORT1: $(pkgx get-port | tail -n1)
+    PORT2: $(pkgx get-port | tail -n1)
   script:
     - caddy version | grep {{version}}
-    - run: |
-        port=8080
-
-        while lsof -i:$port >/dev/null 2>&1; do
-          ((port++))
-        done
-
-        port1=$port
-        port2=$((port + 1))
-
-        # Create the Caddyfile
-        cat > Caddyfile <<EOF
+    # Create the Caddyfile
+    - run: sed -e "s/PORT1/$PORT1/" -e "s/PORT2/$PORT2/" $FIXTURE > Caddyfile
+      fixture: |
         {
-          admin 127.0.0.1:$port1
+          admin 127.0.0.1:PORT1
         }
 
-        http://127.0.0.1:$port2 {
+        http://127.0.0.1:PORT2 {
           respond "Hello, Caddy!"
         }
-        EOF
+    - cat Caddyfile
     # Run Caddy server in the background with its input redirected from an empty stream
-    - run: |
-        caddy run --config Caddyfile > /dev/null 2>&1 <<EOF &
-        EOF
+    - run: echo | caddy run --config Caddyfile --adapter caddyfile &
     # Add a 5-second pause to allow time for the server to start up.
     - sleep 5
-    - curl -s http://127.0.0.1:$port1/config/apps/http/servers/srv0/listen/0 | grep $port2
-    - curl -s http://127.0.0.1:$port2 | grep "Hello, Caddy!"
\ No newline at end of file
+    - curl -s http://127.0.0.1:$PORT1/config/apps/http/servers/srv0/listen/0 | grep $PORT2
+    - curl -s http://127.0.0.1:$PORT2 | grep "Hello, Caddy!"