config: Update 5 files

squashkiwi-streaming/backup.sh

@@ -8,4 +8,4 @@ _check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_
 # shellcheck disable=SC2046
 backup_items $(get_squashkiwi_streaming_paths) || _die "Failed to create backup"
 
-echo "Backup created successfully"
+echo "Backup created successfully (recordings excluded)"

squashkiwi-streaming/config/docker-compose.yml

@@ -10,8 +10,8 @@ services:
       - ${RECORDINGS_FOLDER}:/recordings
     environment:
       - MTX_PROTOCOLS=tcp
-      - MTX_PATHS_COURT_MAIN_SOURCE=rtsp://${CAMERA_USER}:${CAMERA_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1&subtype=0
-      - MTX_PATHS_COURT_SUB_SOURCE=rtsp://${CAMERA_USER}:${CAMERA_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1&subtype=1
+      - MTX_PATHS_COURT_MAIN_SOURCE=${MTX_PATHS_COURT_MAIN_SOURCE}
+      - MTX_PATHS_COURT_SUB_SOURCE=${MTX_PATHS_COURT_SUB_SOURCE}
     healthcheck:
       test: ["CMD", "wget", "-q", "-O", "-", "http://localhost:9997/v2/paths/list"]
       interval: 30s

squashkiwi-streaming/config/service.env

@@ -1,8 +1,9 @@
 # SquashKiwi Streaming Configuration
 # Edit this file to configure your streaming service
 
-LOCAL_DATA_FOLDER="/home/dropshell/example-squashkiwi-streaming-data"
-RECORDINGS_FOLDER="/home/dropshell/example-squashkiwi-streaming-recordings"
+# Data folders
+LOCAL_DATA_FOLDER="/home/dropshell/squashkiwi-streaming-data"
+RECORDINGS_FOLDER="/home/dropshell/squashkiwi-streaming-recordings"
 
 # Project Name used in docker-compose.yml, must be unique on the server.
 PROJECT_NAME="sk-streaming"

squashkiwi-streaming/install.sh

@@ -24,6 +24,16 @@ if [[ "${CAMERA_PASSWORD}" == *[!\@\#\$\&\%]* ]]; then
     export CAMERA_PASSWORD="${CAMERA_PASSWORD_ENCODED}"
 fi
 
+# Create .env file for docker-compose with all required variables
+echo "Creating environment file for docker-compose..."
+cat > "${LOCAL_DATA_FOLDER}/config/.env" <<EOF
+# Auto-generated environment file for docker-compose
+PROJECT_NAME=${PROJECT_NAME}
+RECORDINGS_FOLDER=${RECORDINGS_FOLDER}
+MTX_PATHS_COURT_MAIN_SOURCE=rtsp://${CAMERA_USER}:${CAMERA_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1&subtype=0
+MTX_PATHS_COURT_SUB_SOURCE=rtsp://${CAMERA_USER}:${CAMERA_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1&subtype=1
+EOF
+
 # Test Docker
 _check_docker_installed || _die "Docker test failed, aborting installation..."
 

squashkiwi-streaming/start.sh

@@ -5,13 +5,19 @@ _check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER"
 
 cd "${LOCAL_DATA_FOLDER}/config" || _die "Failed to change to config directory"
 
-# Load environment variables
-set -a
-source "${LOCAL_DATA_FOLDER}/config/service.env"
-set +a
+# Check that .env file exists and show configuration
+if [[ ! -f "${LOCAL_DATA_FOLDER}/config/.env" ]]; then
+    _die ".env file not found at ${LOCAL_DATA_FOLDER}/config/.env - run install first"
+fi
 
-# Start docker compose services
+echo "Checking .env configuration..."
+CONFIGURED_IP=$(grep "MTX_PATHS_COURT_MAIN_SOURCE" "${LOCAL_DATA_FOLDER}/config/.env" | sed -n 's/.*@\([0-9.]*\):.*/\1/p')
+echo "Camera IP from .env: ${CONFIGURED_IP}"
+echo "Camera IP from service.env: ${CAMERA_IP}"
+
+# Start docker compose services (docker-compose will read .env file created by install.sh)
 echo "Starting ${PROJECT_NAME} services..."
+
 docker compose up -d || _die "Failed to start Docker Compose services"
 
 # Wait for services to be healthy