berth updates

berth/ctrl/services.sh

@@ -26,10 +26,7 @@ list() {
         [ -z "$name" ] && continue
         # A placed service has no literal `upstream` — it is derived from the
         # peer's overlay address, so show what it actually resolves to.
-        local shown="$up"
-        case "$placement" in
-            local|instance) shown="$(overlay_get estate "peers.${peer}.address"):${port}" ;;
-        esac
+        local shown; shown="$(service_upstream "$up" "$placement" "$peer" "$port")" || shown=""
         printf '%-12s %-16s %-22s %-9s %s\n' \
             "$name" "${host}.${DOMAIN}" "${shown:--}" "$placement" \
             "$([ -n "$raw" ] && echo 'hand-written' || echo 'generated')"
@@ -62,7 +59,7 @@ render_cloud() {
             local|instance)
                 tmpl=./render/nginx-upstream.tmpl
                 uhost="$(overlay_get estate "peers.${peer}.address")"
-                uport="$port"
+                uport="$port"   # resolved via service_upstream's same rule
                 if [ -z "$uhost" ]; then
                     echo "  ! $name: placement '$placement' names peer '$peer', which has no address" >&2
                     continue