Damien/infra-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(seedbox): extract Self.DNSName specifically using awk

Browse Source 
- Use awk to target DNSName within Self block only
- Prevents matching DNSName from peer entries
- More reliable parsing without jq dependency
This commit is contained in:
Damien Arnodo
2026-01-02 18:02:31 +00:00
parent 5cb9c1cc8a
commit 1974f46039
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
seedbox/install.sh
View File

@@ -46,12 +46,16 @@ generate_password() {
head -c 100 /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 16 || true head -c 100 /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 16 || true
} }
# Get Tailscale FQDN hostname # Get Tailscale FQDN hostname from Self.DNSName
# Uses tailscale status --json and parses Self.DNSName # Extracts DNSName from the Self object in tailscale status --json
get_tailscale_hostname() { get_tailscale_hostname() {
local dns_name local dns_name
# Try to get DNSName from Self object in JSON # Use awk to extract Self.DNSName specifically (not from peers)
dns_name=$(tailscale status --json 2>/dev/null | sed -n 's/.*"DNSName":"\([^"]*\)".*/\1/p' | head -1 | sed 's/\.$//' || true) # Looks for DNSName within the Self block
dns_name=$(tailscale status --json 2>/dev/null | awk -F'"' '
/"Self"/ { in_self=1 }
in_self && /"DNSName"/ { gsub(/\.$/, "", $4); print $4; exit }
' || true)
if [[ -z "$dns_name" ]]; then if [[ -z "$dns_name" ]]; then
# Fallback: use hostname + default tailnet domain hint # Fallback: use hostname + default tailnet domain hint
@@ -205,8 +209,11 @@ EOF
cat << 'MOTD' | sudo tee /etc/update-motd.d/00-seedbox > /dev/null cat << 'MOTD' | sudo tee /etc/update-motd.d/00-seedbox > /dev/null
#!/bin/bash #!/bin/bash
# Get Tailscale FQDN # Get Tailscale FQDN from Self.DNSName
TS_FQDN=$(tailscale status --json 2>/dev/null | sed -n 's/.*"DNSName":"\([^"]*\)".*/\1/p' | head -1 | sed 's/\.$//') TS_FQDN=$(tailscale status --json 2>/dev/null | awk -F'"' '
/"Self"/ { in_self=1 }
in_self && /"DNSName"/ { gsub(/\.$/, "", $4); print $4; exit }
')
[[ -z "$TS_FQDN" ]] && TS_FQDN="$(hostname).ts.net" [[ -z "$TS_FQDN" ]] && TS_FQDN="$(hostname).ts.net"
echo "" echo ""