From d5d979ac3146a5e0893e8e1982efd2cdb746cdb5 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 9 Aug 2026 21:57:23 +0000 Subject: [PATCH] Add multi-instance support to audiobookshelf, emby, mealie, traccar Same pattern already established by services/mattermost.sh and services/wordpress.sh: first instance keeps the plain name/paths/ ports exactly as before (zero behavior change for anyone with a single instance already installed), and only choosing to add a second introduces suffixed naming with its own directory, containers, and ports. - audiobookshelf.sh, emby.sh, mealie.sh: straightforward -- suffixed dir/container name, auto-scanned free host port(s) via `ss`, Caddy subdomain default suffixed to avoid collision. emby.sh's existing music-only mode is untouched, just correctly parameterized. - traccar.sh: the harder one -- has its own dedicated Postgres container, an autoheal container, and a 150-port device-protocol range that can't be scanned port-by-port. Additional instances shift the whole range by 1000 (6000-6150, 7000-7150, ...) based on how many traccar/traccar-* directories already exist, which never lands on Asterisk's fixed ports the way the first instance's range does, so no exclusions are needed there. Also scoped the autoheal label per-instance (autoheal-traccar-) -- autoheal watches by Docker label host-wide, not scoped to a compose project, so two instances sharing the generic "autoheal" label would each try to manage the other's container too. Found and fixed two real bugs via testing before committing, not just code review: - The device-protocol range offset counted existing instances via `find $DOCKER_DIR -maxdepth 1 -name 'traccar*'`, which also matches $DOCKER_DIR itself if its own basename happens to start with "traccar" (true in my test harness, structurally possible in real use too) -- fixed with -mindepth 1. - Verified port auto-scanning actually detects a simulated in-use port and increments past it, using a stateful fake `ss` rather than trusting the logic by inspection alone. Verified end-to-end for all four: first instance unchanged from prior behavior, second instance gets fully distinct dir/containers/ports, and (traccar specifically) correct DB container, correctly-scoped autoheal label, and correct shifted port range in the generated compose file. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01TBtExJcqxnokyZZKmphdug --- services/audiobookshelf.sh | 71 ++++++++++++--- services/emby.sh | 78 +++++++++++++---- services/mealie.sh | 74 ++++++++++++---- services/traccar.sh | 171 +++++++++++++++++++++++++++---------- 4 files changed, 308 insertions(+), 86 deletions(-) diff --git a/services/audiobookshelf.sh b/services/audiobookshelf.sh index 4aa96b8..e7be929 100644 --- a/services/audiobookshelf.sh +++ b/services/audiobookshelf.sh @@ -186,18 +186,60 @@ register_service audiobookshelf media "Audiobook & podcast server (Audiobookshel install_audiobookshelf() { require_docker || return 1 + # ── Instance selection ─────────────────────────────────────────────────── + # First instance keeps the plain "audiobookshelf" name/paths/port exactly + # as before (zero behavior change for anyone with a single instance). Only + # asking to add a second one introduces suffixed naming — same pattern as + # services/mattermost.sh and services/wordpress.sh. local ABS_DIR="$DOCKER_DIR/audiobookshelf" + local INSTANCE_SUFFIX="" CONTAINER="audiobookshelf" + local WEB_PORT="13378" local DEFAULT_AUDIOBOOKS="$ACTUAL_HOME/audiobooks" if [ "$DRY_RUN" = true ]; then echo "[DRY-RUN] Audiobookshelf would:" - echo " - Create $ABS_DIR with docker-compose.yml + .env (config/ metadata/ podcasts/)" + echo " - Offer to add a new, separate instance if one already exists" + echo " - Create \$DOCKER_DIR/audiobookshelf(-) with docker-compose.yml + .env" echo " - Mount an audiobooks folder (default $DEFAULT_AUDIOBOOKS) at /audiobooks" - echo " - Expose port 13378" + echo " - Auto-scan for a free host port if this is an additional instance" echo " - Offer a Caddy reverse proxy and to start the container" return 0 fi + if [ -d "$ABS_DIR" ]; then + echo "" + echo " Audiobookshelf is already installed at $ABS_DIR." + echo " 1) Manage that install (update / full reinstall / cancel)" + echo " 2) Add a NEW, separate Audiobookshelf instance alongside it (its own" + echo " server, library, and port — full isolation)" + echo "" + local _TOP_CHOICE="" + prompt_text " Choice [1/2]:" "1" _TOP_CHOICE + if [ "$_TOP_CHOICE" = "2" ]; then + local _suffix="" + while true; do + prompt_text " Short name for the new instance (letters/numbers/hyphens, e.g. 'kids'):" "" _suffix + _suffix="$(echo "$_suffix" | tr -cs 'a-zA-Z0-9-' '-' | sed 's/^-*//;s/-*$//')" + if [ -z "$_suffix" ]; then + log_warning "Name can't be empty."; continue + fi + if [ -d "$DOCKER_DIR/audiobookshelf-$_suffix" ]; then + log_warning "audiobookshelf-$_suffix already exists — pick another name."; continue + fi + break + done + INSTANCE_SUFFIX="$_suffix" + ABS_DIR="$DOCKER_DIR/audiobookshelf-$_suffix" + CONTAINER="audiobookshelf-$_suffix" + DEFAULT_AUDIOBOOKS="$ACTUAL_HOME/audiobooks-$_suffix" + + while ss -tlnH "sport = :${WEB_PORT}" 2>/dev/null | grep -q .; do + WEB_PORT=$((WEB_PORT + 1)) + done + log_info "New instance: $ABS_DIR (port $WEB_PORT)" + fi + fi + local AUDIOBOOKS_PATH="" prompt_text "Path to audiobooks folder [$DEFAULT_AUDIOBOOKS]:" "$DEFAULT_AUDIOBOOKS" AUDIOBOOKS_PATH AUDIOBOOKS_PATH="${AUDIOBOOKS_PATH/#\~/$ACTUAL_HOME}"; AUDIOBOOKS_PATH="${AUDIOBOOKS_PATH%/}" @@ -232,13 +274,13 @@ networks: fi cat > docker-compose.yml << ABS_COMPOSE -name: audiobookshelf +name: $CONTAINER services: audiobookshelf: image: ghcr.io/advplyr/audiobookshelf:latest - container_name: audiobookshelf - hostname: audiobookshelf + container_name: $CONTAINER + hostname: $CONTAINER restart: unless-stopped environment: - TZ=$TZ_VAL @@ -248,7 +290,7 @@ services: - \${AUDIOBOOKS_PATH}:/audiobooks - \${PODCASTS_PATH:-./podcasts}:/podcasts ports: - - "13378:80" + - "${WEB_PORT}:80" ${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} ABS_COMPOSE @@ -260,16 +302,19 @@ ABS_ENV mkdir -p config metadata podcasts chown -R "$ACTUAL_USER:$ACTUAL_USER" "$ABS_DIR" - log_success "Audiobookshelf configured at $ABS_DIR" + log_success "Audiobookshelf${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} configured at $ABS_DIR (port $WEB_PORT)" - configure_caddy_for_service "AudioBookshelf" "audiobookshelf:80" "audiobooks" + configure_caddy_for_service "Audiobookshelf${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)}" "${CONTAINER}:80" "audiobooks${INSTANCE_SUFFIX:+-$INSTANCE_SUFFIX}" write_readme "$ABS_DIR" << MD -# Audiobookshelf +# Audiobookshelf${INSTANCE_SUFFIX:+ — $INSTANCE_SUFFIX} Self-hosted audiobook and podcast server with progress sync across devices. +$( [ -n "$INSTANCE_SUFFIX" ] && echo " +This is a separate, fully isolated instance (own server, own library, own +port) — not a shared library with another Audiobookshelf instance.") -- Web UI: http://localhost:13378 +- Web UI: http://localhost:${WEB_PORT} - Audiobooks: \`$AUDIOBOOKS_PATH\` → mounted at /audiobooks - Podcasts: \`podcasts/\` in this folder → /podcasts (change \`PODCASTS_PATH\` in .env) - App data: \`config/\` and \`metadata/\` @@ -288,13 +333,13 @@ pointing at /audiobooks and /podcasts. MD local START_ABS="" - prompt_yn "Start Audiobookshelf now? (y/n):" "y" START_ABS + prompt_yn "Start Audiobookshelf${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} now? (y/n):" "y" START_ABS if [ "$START_ABS" = "y" ] || [ "$START_ABS" = "Y" ]; then - docker compose up -d && log_success "Audiobookshelf started" || log_warning "Failed to start — check: docker compose logs" + docker compose up -d && log_success "Audiobookshelf${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} started" || log_warning "Failed to start — check: docker compose logs" fi echo "" - echo " Access at: http://localhost:13378" + echo " Access at: http://localhost:${WEB_PORT}" echo "" } diff --git a/services/emby.sh b/services/emby.sh index d95c35e..8e50f79 100644 --- a/services/emby.sh +++ b/services/emby.sh @@ -197,21 +197,66 @@ register_service emby media "Media server — movies, TV, music (Emby); supports install_emby() { require_docker || return 1 + # ── Instance selection ─────────────────────────────────────────────────── + # First instance keeps the plain "emby" name/paths/ports exactly as + # before (zero behavior change for anyone with a single instance). Only + # asking to add a second one introduces suffixed naming — same pattern as + # services/mattermost.sh and services/wordpress.sh. local EMBY_DIR="$DOCKER_DIR/emby" + local INSTANCE_SUFFIX="" CONTAINER="emby" + local WEB_PORT="8096" HTTPS_PORT="8920" local DEFAULT_MEDIA="$ACTUAL_HOME/media" if [ "$DRY_RUN" = true ]; then echo "[DRY-RUN] Emby would:" + echo " - Offer to add a new, separate instance if one already exists" echo " - Ask whether this is a music-only setup (changes the default folder/guidance only —" echo " which library types you add still happens in Emby's own web setup wizard)" - echo " - Create $EMBY_DIR with docker-compose.yml + .env (config/)" + echo " - Create \$DOCKER_DIR/emby(-) with docker-compose.yml + .env (config/)" echo " - Mount a media folder (default $DEFAULT_MEDIA) at /media" echo " - Run as UID/GID $(id -u "$ACTUAL_USER")/$(id -g "$ACTUAL_USER")" - echo " - Expose ports 8096 (web) and 8920 (https)" + echo " - Auto-scan for free host ports if this is an additional instance" echo " - Offer a Caddy reverse proxy and to start the container" return 0 fi + if [ -d "$EMBY_DIR" ]; then + echo "" + echo " Emby is already installed at $EMBY_DIR." + echo " 1) Manage that install (update / full reinstall / cancel)" + echo " 2) Add a NEW, separate Emby instance alongside it (its own server," + echo " library, and ports — full isolation, not another Emby library)" + echo "" + local _TOP_CHOICE="" + prompt_text " Choice [1/2]:" "1" _TOP_CHOICE + if [ "$_TOP_CHOICE" = "2" ]; then + local _suffix="" + while true; do + prompt_text " Short name for the new instance (letters/numbers/hyphens, e.g. 'music'):" "" _suffix + _suffix="$(echo "$_suffix" | tr -cs 'a-zA-Z0-9-' '-' | sed 's/^-*//;s/-*$//')" + if [ -z "$_suffix" ]; then + log_warning "Name can't be empty."; continue + fi + if [ -d "$DOCKER_DIR/emby-$_suffix" ]; then + log_warning "emby-$_suffix already exists — pick another name."; continue + fi + break + done + INSTANCE_SUFFIX="$_suffix" + EMBY_DIR="$DOCKER_DIR/emby-$_suffix" + CONTAINER="emby-$_suffix" + DEFAULT_MEDIA="$ACTUAL_HOME/media-$_suffix" + + while ss -tlnH "sport = :${WEB_PORT}" 2>/dev/null | grep -q .; do + WEB_PORT=$((WEB_PORT + 1)) + done + while ss -tlnH "sport = :${HTTPS_PORT}" 2>/dev/null | grep -q .; do + HTTPS_PORT=$((HTTPS_PORT + 1)) + done + log_info "New instance: $EMBY_DIR (web port $WEB_PORT, https port $HTTPS_PORT)" + fi + fi + local MUSIC_ONLY="" prompt_yn "Set this up as a music-only server (skip movies/TV)? (y/n):" "n" MUSIC_ONLY @@ -257,13 +302,13 @@ networks: fi cat > docker-compose.yml << EMBY_COMPOSE -name: emby +name: $CONTAINER services: emby: image: emby/embyserver:latest - container_name: emby - hostname: emby + container_name: $CONTAINER + hostname: $CONTAINER restart: unless-stopped environment: - UID=$UID_VAL @@ -273,8 +318,8 @@ services: - ./config:/config - \${MEDIA_PATH}:/media ports: - - "8096:8096" - - "8920:8920" + - "${WEB_PORT}:8096" + - "${HTTPS_PORT}:8920" # Uncomment for hardware transcoding (Intel/AMD): # devices: # - /dev/dri:/dev/dri @@ -288,16 +333,19 @@ EMBY_ENV mkdir -p config chown -R "$ACTUAL_USER:$ACTUAL_USER" "$EMBY_DIR" - log_success "Emby configured at $EMBY_DIR" + log_success "Emby${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} configured at $EMBY_DIR (port $WEB_PORT)" - configure_caddy_for_service "Emby" "emby:8096" "emby" + configure_caddy_for_service "Emby${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)}" "${CONTAINER}:8096" "emby${INSTANCE_SUFFIX:+-$INSTANCE_SUFFIX}" write_readme "$EMBY_DIR" << MD -# Emby +# Emby${INSTANCE_SUFFIX:+ — $INSTANCE_SUFFIX} Media server for movies, TV, and music. +$( [ -n "$INSTANCE_SUFFIX" ] && echo " +This is a separate, fully isolated instance (own server, own library, own +ports) — not another library within another Emby instance.") -- Web UI: http://localhost:8096 (HTTPS on 8920) +- Web UI: http://localhost:${WEB_PORT} (HTTPS on ${HTTPS_PORT}) - Media folder: \`$MEDIA_PATH\` → mounted at /media - App data: \`config/\` in this folder - Edit the media path in \`.env\` (\`MEDIA_PATH=\`), then \`docker compose up -d\`. @@ -322,7 +370,7 @@ you actually add still happens in Emby's own first-run setup wizard, not this script (Emby has no compose/env flag for "music-only"; it's a web-UI step): -1. Open http://localhost:8096 and complete the setup wizard. +1. Open http://localhost:${WEB_PORT} and complete the setup wizard. 2. When adding a library, choose type **Music**, point it at \`/media\`, and don't add any Movies/TV/other library types. 3. **Per-user library access** (the reason to pick Emby over a Squeezebox @@ -343,13 +391,13 @@ MUSICMD MD local START_EMBY="" - prompt_yn "Start Emby now? (y/n):" "y" START_EMBY + prompt_yn "Start Emby${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} now? (y/n):" "y" START_EMBY if [ "$START_EMBY" = "y" ] || [ "$START_EMBY" = "Y" ]; then - docker compose up -d && log_success "Emby started" || log_warning "Failed to start — check: docker compose logs" + docker compose up -d && log_success "Emby${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} started" || log_warning "Failed to start — check: docker compose logs" fi echo "" - echo " Access at: http://localhost:8096" + echo " Access at: http://localhost:${WEB_PORT}" echo "" } diff --git a/services/mealie.sh b/services/mealie.sh index 0b0c762..a4a6911 100644 --- a/services/mealie.sh +++ b/services/mealie.sh @@ -186,17 +186,58 @@ register_service mealie utilities "Recipe manager & meal planner (Mealie)" 9925 install_mealie() { require_docker || return 1 + # ── Instance selection ─────────────────────────────────────────────────── + # First instance keeps the plain "mealie" name/paths/port exactly as + # before (zero behavior change for anyone with a single instance). Only + # asking to add a second one introduces suffixed naming — same pattern as + # services/mattermost.sh and services/wordpress.sh. local MEALIE_DIR="$DOCKER_DIR/mealie" + local INSTANCE_SUFFIX="" CONTAINER="mealie" + local WEB_PORT="9925" if [ "$DRY_RUN" = true ]; then echo "[DRY-RUN] Mealie would:" - echo " - Create $MEALIE_DIR with docker-compose.yml (data/)" - echo " - Expose port 9925" + echo " - Offer to add a new, separate instance if one already exists" + echo " - Create \$DOCKER_DIR/mealie(-) with docker-compose.yml (data/)" + echo " - Auto-scan for a free host port if this is an additional instance" echo " - Default login: changeme@email.com / MyPassword (change immediately)" echo " - Offer a Caddy reverse proxy and to start the container" return 0 fi + if [ -d "$MEALIE_DIR" ]; then + echo "" + echo " Mealie is already installed at $MEALIE_DIR." + echo " 1) Manage that install (update / full reinstall / cancel)" + echo " 2) Add a NEW, separate Mealie instance alongside it (its own" + echo " server, recipes, and port — full isolation)" + echo "" + local _TOP_CHOICE="" + prompt_text " Choice [1/2]:" "1" _TOP_CHOICE + if [ "$_TOP_CHOICE" = "2" ]; then + local _suffix="" + while true; do + prompt_text " Short name for the new instance (letters/numbers/hyphens, e.g. 'family'):" "" _suffix + _suffix="$(echo "$_suffix" | tr -cs 'a-zA-Z0-9-' '-' | sed 's/^-*//;s/-*$//')" + if [ -z "$_suffix" ]; then + log_warning "Name can't be empty."; continue + fi + if [ -d "$DOCKER_DIR/mealie-$_suffix" ]; then + log_warning "mealie-$_suffix already exists — pick another name."; continue + fi + break + done + INSTANCE_SUFFIX="$_suffix" + MEALIE_DIR="$DOCKER_DIR/mealie-$_suffix" + CONTAINER="mealie-$_suffix" + + while ss -tlnH "sport = :${WEB_PORT}" 2>/dev/null | grep -q .; do + WEB_PORT=$((WEB_PORT + 1)) + done + log_info "New instance: $MEALIE_DIR (port $WEB_PORT)" + fi + fi + mkdir -p "$MEALIE_DIR" ensure_docker_dir_ownership "$MEALIE_DIR" cd "$MEALIE_DIR" || return 1 @@ -207,9 +248,9 @@ install_mealie() { # BASE_URL must match the public URL Mealie is served on (used for email links, # OAuth redirects, and the web app manifest). Default to SITE_DOMAIN if set. - local MEALIE_BASE_URL="http://localhost:9925" + local MEALIE_BASE_URL="http://localhost:${WEB_PORT}" if [ -n "$SITE_DOMAIN" ] && [ "$SITE_DOMAIN" != "example.com" ]; then - MEALIE_BASE_URL="https://recipes.${SITE_DOMAIN}" + MEALIE_BASE_URL="https://recipes${INSTANCE_SUFFIX:+-$INSTANCE_SUFFIX}.${SITE_DOMAIN}" fi # Mirrors configure_caddy_for_service's own mode resolution (lib/common.sh): @@ -236,13 +277,13 @@ networks: fi cat > docker-compose.yml << MEALIE_COMPOSE -name: mealie +name: $CONTAINER services: mealie: image: ghcr.io/mealie-recipes/mealie:latest - container_name: mealie - hostname: mealie + container_name: $CONTAINER + hostname: $CONTAINER restart: unless-stopped env_file: .env environment: @@ -255,7 +296,7 @@ services: volumes: - ./data:/app/data ports: - - "9925:9000" + - "${WEB_PORT}:9000" ${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} MEALIE_COMPOSE @@ -268,17 +309,20 @@ MEALIE_ENV mkdir -p data chown -R "$ACTUAL_USER:$ACTUAL_USER" "$MEALIE_DIR" - log_success "Mealie configured at $MEALIE_DIR" + log_success "Mealie${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} configured at $MEALIE_DIR (port $WEB_PORT)" - configure_caddy_for_service "Mealie" "mealie:9000" "recipes" + configure_caddy_for_service "Mealie${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)}" "${CONTAINER}:9000" "recipes${INSTANCE_SUFFIX:+-$INSTANCE_SUFFIX}" write_readme "$MEALIE_DIR" << MD -# Mealie +# Mealie${INSTANCE_SUFFIX:+ — $INSTANCE_SUFFIX} Recipe manager and meal planner — import recipes from any URL, plan meals, and generate shopping lists. Optional AI-powered recipe parsing. +$( [ -n "$INSTANCE_SUFFIX" ] && echo " +This is a separate, fully isolated instance (own server, own recipes, own +port) — not shared recipes with another Mealie instance.") -- Web UI: http://localhost:9925 +- Web UI: http://localhost:${WEB_PORT} - Default login: changeme@email.com / MyPassword (change immediately!) - App data: \`data/\` @@ -296,13 +340,13 @@ docker compose pull && docker compose up -d # update MD local START_MEALIE="" - prompt_yn "Start Mealie now? (y/n):" "y" START_MEALIE + prompt_yn "Start Mealie${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} now? (y/n):" "y" START_MEALIE if [ "$START_MEALIE" = "y" ] || [ "$START_MEALIE" = "Y" ]; then - docker compose up -d && log_success "Mealie started" || log_warning "Failed to start — check: docker compose logs" + docker compose up -d && log_success "Mealie${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} started" || log_warning "Failed to start — check: docker compose logs" fi echo "" - echo " Access at: http://localhost:9925" + echo " Access at: http://localhost:${WEB_PORT}" echo " Default: changeme@email.com / MyPassword (change immediately!)" echo "" } diff --git a/services/traccar.sh b/services/traccar.sh index 1c08182..337ce65 100644 --- a/services/traccar.sh +++ b/services/traccar.sh @@ -188,21 +188,87 @@ register_service traccar utilities "GPS tracking server — phones, vehicles, as install_traccar() { require_docker || return 1 + # ── Instance selection ─────────────────────────────────────────────────── + # First instance keeps the plain "traccar" name/paths/ports exactly as + # before (zero behavior change for anyone with a single instance). Only + # asking to add a second one introduces suffixed naming — same pattern as + # services/mattermost.sh and services/wordpress.sh. + # + # The device-protocol port range is the one thing that can't just be + # auto-scanned port-by-port (150+ ports, and the first instance already + # carves Asterisk's exact ports out of it) — instead each additional + # instance's whole range shifts by 1000 (6000-6150 for the first extra + # instance, 7000-7150 for the next, ...), determined by how many + # traccar/traccar-* directories already exist. Those shifted ranges never + # land on Asterisk's fixed ports (5038/5060/5061), so no exclusions are + # needed there the way the first instance needs them. local TRACCAR_DIR="$DOCKER_DIR/traccar" + local INSTANCE_SUFFIX="" CONTAINER="traccar" DB_CONTAINER="traccar-db" + local AUTOHEAL_CONTAINER="traccar-autoheal" AUTOHEAL_LABEL="autoheal" + local WEB_PORT="8082" + local PROTO_MIN=5000 PROTO_MAX=5150 if [ "$DRY_RUN" = true ]; then echo "[DRY-RUN] Traccar would:" - echo " - Create $TRACCAR_DIR with docker-compose.yml + .env" + echo " - Offer to add a new, separate instance if one already exists" + echo " - Create \$DOCKER_DIR/traccar(-) with docker-compose.yml + .env" echo " - Deploy a PostgreSQL database container (Traccar no longer ships H2)" echo " - Point Traccar at it via env vars (CONFIG_USE_ENVIRONMENT_VARIABLES) — no secrets in a config file" echo " - Deploy an autoheal container that restarts Traccar if its healthcheck fails" - echo " - Expose port 8082 (web) and 5000-5150 (device protocols; 5038/5060/5061 skipped — Asterisk keeps priority on those)" + echo " - Expose port 8082 (web) and 5000-5150 (device protocols; 5038/5060/5061 skipped — Asterisk keeps" + echo " priority on those); an additional instance's device-protocol range shifts by 1000 instead" echo " - No default login — register the first account at the web UI, it becomes admin" echo " - Offer optional ntfy push notifications (self-hosted anywhere, or ntfy.sh)" echo " - Offer a Caddy reverse proxy and to start the container" return 0 fi + if [ -d "$TRACCAR_DIR" ]; then + echo "" + echo " Traccar is already installed at $TRACCAR_DIR." + echo " 1) Manage that install (update / full reinstall / cancel)" + echo " 2) Add a NEW, separate Traccar instance alongside it (its own" + echo " server, database, and device-protocol port range — full isolation)" + echo "" + local _TOP_CHOICE="" + prompt_text " Choice [1/2]:" "1" _TOP_CHOICE + if [ "$_TOP_CHOICE" = "2" ]; then + local _suffix="" + while true; do + prompt_text " Short name for the new instance (letters/numbers/hyphens, e.g. 'fleet-b'):" "" _suffix + _suffix="$(echo "$_suffix" | tr -cs 'a-zA-Z0-9-' '-' | sed 's/^-*//;s/-*$//')" + if [ -z "$_suffix" ]; then + log_warning "Name can't be empty."; continue + fi + if [ -d "$DOCKER_DIR/traccar-$_suffix" ]; then + log_warning "traccar-$_suffix already exists — pick another name."; continue + fi + break + done + INSTANCE_SUFFIX="$_suffix" + TRACCAR_DIR="$DOCKER_DIR/traccar-$_suffix" + CONTAINER="traccar-$_suffix" + DB_CONTAINER="traccar-$_suffix-db" + AUTOHEAL_CONTAINER="traccar-$_suffix-autoheal" + AUTOHEAL_LABEL="autoheal-traccar-$_suffix" + + while ss -tlnH "sport = :${WEB_PORT}" 2>/dev/null | grep -q .; do + WEB_PORT=$((WEB_PORT + 1)) + done + + # Count existing traccar/traccar-* dirs (this new one isn't + # created yet, so the first extra instance counts exactly 1 + # existing dir -> offset 1 -> 6000-6150). + local _existing_count + _existing_count="$(find "$DOCKER_DIR" -mindepth 1 -maxdepth 1 -name 'traccar*' -type d 2>/dev/null | wc -l)" + local _offset=$((_existing_count * 1000)) + PROTO_MIN=$((5000 + _offset)) + PROTO_MAX=$((5150 + _offset)) + + log_info "New instance: $TRACCAR_DIR (web port $WEB_PORT, device protocols $PROTO_MIN-$PROTO_MAX)" + fi + fi + mkdir -p "$TRACCAR_DIR" # Non-recursive on purpose — a rerun already has a `db/` full of Postgres's # own data files, owned by whatever uid the postgres container runs as @@ -299,14 +365,48 @@ networks: " fi + # First instance keeps the exact existing Asterisk-exclusion port block + # (5000-5150 with 5038/5060/5061 carved out). An additional instance's + # range is shifted by 1000 per instance (computed above), which never + # lands on Asterisk's fixed ports, so it just publishes the plain range + # with no exclusions needed. + local _PROTO_PORT_BLOCK + if [ -z "$INSTANCE_SUFFIX" ]; then + _PROTO_PORT_BLOCK=" # 5038 (AMI), 5060 (SIP, tcp+udp), and 5061 (SIP TLS, tcp) are skipped: + # they're Asterisk's ports (services/asterisk.sh runs Asterisk with + # network_mode: host, so it binds them directly on the host, not + # through Docker networking). Publishing the full 5000-5150 range here + # would fight Asterisk for those exact host ports on any box running + # both services from this repo. Confirmed live: this is what made + # \"docker network connect caddy_net traccar\" and then a plain + # \`docker compose up -d\` both fail with \"failed to bind host port + # 0.0.0.0:5038/tcp\" and then \"...5060/tcp: address already in use\" on + # a box with Asterisk's PSTN trunk already installed. Checked every + # other network_mode: host service in this repo (caddy, homeassistant, + # kyber-server, lyrion, mattermost, watchyourlan, wolf-pair, wolf) — + # none of them land in 5000-5150, so Asterisk is the only conflict. + - \"5000-5037:5000-5037\" + - \"5039-5059:5039-5059\" + - \"5062-5150:5062-5150\" + - \"5000-5059:5000-5059/udp\" + - \"5061-5150:5061-5150/udp\"" + else + _PROTO_PORT_BLOCK=" # Shifted by 1000 from the default 5000-5150 range so this instance + # doesn't collide with the first (or any other) Traccar instance on + # this box — never lands on Asterisk's fixed ports either, so no + # exclusions are needed here the way the first instance needs them. + - \"${PROTO_MIN}-${PROTO_MAX}:${PROTO_MIN}-${PROTO_MAX}\" + - \"${PROTO_MIN}-${PROTO_MAX}:${PROTO_MIN}-${PROTO_MAX}/udp\"" + fi + cat > docker-compose.yml << TRACCAR_COMPOSE -name: traccar +name: $CONTAINER services: db: image: postgres:15-alpine - container_name: traccar-db - hostname: traccar-db + container_name: $DB_CONTAINER + hostname: $DB_CONTAINER restart: unless-stopped env_file: .env volumes: @@ -319,19 +419,19 @@ ${_CADDY_NET_BLOCK} healthcheck: traccar: image: traccar/traccar:latest - container_name: traccar - hostname: traccar + container_name: $CONTAINER + hostname: $CONTAINER restart: unless-stopped env_file: .env depends_on: db: condition: service_healthy labels: - - "autoheal=true" + - "${AUTOHEAL_LABEL}=true" environment: CONFIG_USE_ENVIRONMENT_VARIABLES: "true" DATABASE_DRIVER: org.postgresql.Driver - DATABASE_URL: jdbc:postgresql://traccar-db:5432/\${POSTGRES_DB}?sslmode=disable + DATABASE_URL: jdbc:postgresql://${DB_CONTAINER}:5432/\${POSTGRES_DB}?sslmode=disable DATABASE_USER: \${POSTGRES_USER} DATABASE_PASSWORD: \${POSTGRES_PASSWORD} healthcheck: @@ -344,32 +444,15 @@ ${_CADDY_NET_BLOCK} healthcheck: - ./logs:/opt/traccar/logs:rw - ./data:/opt/traccar/data:rw ports: - - "8082:8082" - # 5038 (AMI), 5060 (SIP, tcp+udp), and 5061 (SIP TLS, tcp) are skipped: - # they're Asterisk's ports (services/asterisk.sh runs Asterisk with - # network_mode: host, so it binds them directly on the host, not - # through Docker networking). Publishing the full 5000-5150 range here - # would fight Asterisk for those exact host ports on any box running - # both services from this repo. Confirmed live: this is what made - # "docker network connect caddy_net traccar" and then a plain - # `docker compose up -d` both fail with "failed to bind host port - # 0.0.0.0:5038/tcp" and then "...5060/tcp: address already in use" on - # a box with Asterisk's PSTN trunk already installed. Checked every - # other network_mode: host service in this repo (caddy, homeassistant, - # kyber-server, lyrion, mattermost, watchyourlan, wolf-pair, wolf) — - # none of them land in 5000-5150, so Asterisk is the only conflict. - - "5000-5037:5000-5037" - - "5039-5059:5039-5059" - - "5062-5150:5062-5150" - - "5000-5059:5000-5059/udp" - - "5061-5150:5061-5150/udp" + - "${WEB_PORT}:8082" +${_PROTO_PORT_BLOCK} ${_CADDY_NET_BLOCK} autoheal: image: willfarrell/autoheal:latest - container_name: traccar-autoheal + container_name: $AUTOHEAL_CONTAINER restart: unless-stopped environment: - AUTOHEAL_CONTAINER_LABEL: autoheal + AUTOHEAL_CONTAINER_LABEL: ${AUTOHEAL_LABEL} AUTOHEAL_INTERVAL: 60 AUTOHEAL_START_PERIOD: 3600 volumes: @@ -422,9 +505,9 @@ TRACCAR_ENV # db/ is deliberately excluded — see the comment on the earlier chown. chown "$ACTUAL_USER:$ACTUAL_USER" "$TRACCAR_DIR" docker-compose.yml .env chown -R "$ACTUAL_USER:$ACTUAL_USER" logs data - log_success "Traccar configured at $TRACCAR_DIR" + log_success "Traccar${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} configured at $TRACCAR_DIR (port $WEB_PORT)" - configure_caddy_for_service "Traccar" "traccar:8082" "traccar" + configure_caddy_for_service "Traccar${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)}" "${CONTAINER}:8082" "traccar${INSTANCE_SUFFIX:+-$INSTANCE_SUFFIX}" local _NTFY_README_BLOCK="" if [ -n "$SMS_HTTP_URL" ]; then @@ -445,27 +528,29 @@ gateway. Configured in \`.env\`: \`SMS_HTTP_URL\`, \`SMS_HTTP_TEMPLATE\` fi write_readme "$TRACCAR_DIR" << MD -# Traccar +# Traccar${INSTANCE_SUFFIX:+ — $INSTANCE_SUFFIX} GPS tracking server. Track phones, vehicles, and assets via the Traccar Android/iOS app, OwnTracks, or any of 200+ supported device protocols. +$( [ -n "$INSTANCE_SUFFIX" ] && echo " +This is a separate, fully isolated instance (own server, own database, own +device-protocol port range) — not shared tracking data with another +Traccar instance.") -- Web UI: http://localhost:8082 +- Web UI: http://localhost:${WEB_PORT} - No default login — Traccar ships with no built-in account. Open the web UI and register the first user; it's automatically made admin. Self-registration stays open to anyone who reaches this server until you turn it off, so do this right away, then go to Settings → Server → Permissions and uncheck Registration. -- Device protocols: ports 5000-5150 (TCP + UDP; 5038/tcp, 5060/tcp+udp, and - 5061/tcp are skipped — reserved for Asterisk's AMI and SIP if this box also - runs Asterisk from this repo, which gets priority on those ports) +- Device protocols: ports ${PROTO_MIN}-${PROTO_MAX} (TCP + UDP$( [ -z "$INSTANCE_SUFFIX" ] && echo "; 5038/tcp, 5060/tcp+udp, and 5061/tcp are skipped — reserved for Asterisk's AMI and SIP if this box also runs Asterisk from this repo, which gets priority on those ports")) - App data: \`data/\` and \`logs/\` -- Database: PostgreSQL (\`traccar-db\` container, data in \`db/\`) +- Database: PostgreSQL (\`$DB_CONTAINER\` container, data in \`db/\`) - All database settings (name, user, password) live in \`.env\` — Traccar reads them directly via env vars, nothing is duplicated in a config file. Change the password there (then recreate both containers) if you need to rotate it. -- Autoheal: \`traccar-autoheal\` restarts the \`traccar\` container if its healthcheck fails +- Autoheal: \`$AUTOHEAL_CONTAINER\` restarts the \`$CONTAINER\` container if its healthcheck fails (scoped to this instance only via the \`$AUTOHEAL_LABEL\` label — it won't touch any other Traccar instance's container) ${_NTFY_README_BLOCK} ## Manage \`\`\`bash @@ -477,18 +562,18 @@ docker compose pull && docker compose up -d # update \`\`\` ## Mobile apps -- Traccar Client (Android/iOS): set server to \`http://YOUR-IP:8082\` +- Traccar Client (Android/iOS): set server to \`http://YOUR-IP:${WEB_PORT}\` - OwnTracks (Android/iOS): configure HTTP endpoint to Traccar MD local START_TRACCAR="" - prompt_yn "Start Traccar now? (y/n):" "y" START_TRACCAR + prompt_yn "Start Traccar${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} now? (y/n):" "y" START_TRACCAR if [ "$START_TRACCAR" = "y" ] || [ "$START_TRACCAR" = "Y" ]; then - docker compose up -d && log_success "Traccar started" || log_warning "Failed to start — check: docker compose logs" + docker compose up -d && log_success "Traccar${INSTANCE_SUFFIX:+ ($INSTANCE_SUFFIX)} started" || log_warning "Failed to start — check: docker compose logs" fi echo "" - echo " Access at: http://localhost:8082" + echo " Access at: http://localhost:${WEB_PORT}" echo " No default login — register the first account now; it becomes admin." echo " Then disable further registration: Settings → Server → Permissions." if [ -n "$SMS_HTTP_URL" ]; then