Skip to content

Sonnet: adjust install.sh for proxy mode #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paweljw merged 1 commit into from
Nov 24, 2025
Merged

Sonnet: adjust install.sh for proxy mode #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ else
fi

# Adjust Compose port exposure rules
# - Keep existing localhost bindings: 34320 and 33000
# - Adds ports section to collector service (inserted before volumes section)
# - If PROXY_PORT present, add host mapping: ${PROXY_PORT}:${PROXY_PORT} (for upstream proxy in Vector)
# - Add port 80 for ACME validation when PROXY_PORT==443 or USE_TLS is set (and PROXY_PORT!=80)

Expand All @@ -136,21 +136,36 @@ adjust_compose_ports() {
fi

awk -v addport="$PROXY_PORT" -v add80="$bind80" '
BEGIN { inserted=0 }
BEGIN { inserted=0; in_collector=0 }
{
# Remove previously inserted install lines for idempotence
if ($0 ~ /# install: (proxy port|acme http-01)/) { next }
print $0
# Append new mappings right after the 33000 mapping
if ($0 ~ /127\.0\.0\.1:33000:33000/ && inserted==0) {
if (addport != "") {
print " - \"" addport ":" addport "\" # install: proxy port"
}
if (add80 != "") {
print " - \"80:80\" # install: acme http-01"
if ($0 ~ /# install: (proxy port|acme http-01|ports section)/) { next }
if ($0 ~ /^[[:space:]]*ports:[[:space:]]*$/ && in_collector==1) { next }

# Track if we are in the collector service
if ($0 ~ /^[[:space:]]*collector:[[:space:]]*$/) {
in_collector=1
}
# Reset when we hit the next service (beyla, etc.)
if ($0 ~ /^[[:space:]]*[a-z_-]+:[[:space:]]*$/ && $0 !~ /collector:/) {
in_collector=0
}

# Insert ports section before volumes section in collector
if (in_collector==1 && inserted==0 && $0 ~ /^[[:space:]]*volumes:[[:space:]]*$/) {
if (addport != "" || add80 != "") {
print " ports: # install: ports section"
if (addport != "") {
print " - \"" addport ":" addport "\" # install: proxy port"
}
if (add80 != "") {
print " - \"80:80\" # install: acme http-01"
}
}
inserted=1
}

print $0
}
' "$file" > "$tmpfile"
mv "$tmpfile" "$file"
Expand Down