Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ JWT_SECRET_KEY=your-jwt-secret-key-here
# ===== BACKEND URL =====
BACKEND_URL=http://backend:5000

# ===== TAILSCALE NETWORKING =====
# Get your auth key from: https://tailscale.com/admin/cloudapi
TAILSCALE_API_KEY=
TAILSCALE_TAILNET_ID=
# ===== MESH_VPN NETWORKING =====
# Get your auth key from: https://mesh-vpn.com/admin/cloudapi
MESH_VPN_API_KEY=
MESH_VPN_NETWORK_ID=

# ===== RECORDING SETTINGS =====
AUDIO_THRESHOLD_DB=70 # dB threshold for audio-triggered recording
Expand Down
10 changes: 5 additions & 5 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ JWT_SECRET_KEY=your-jwt-secret-key-here
# ===== BACKEND URL =====
BACKEND_URL=http://localhost:5000

# ===== TAILSCALE NETWORKING =====
# Get your auth key from: https://tailscale.com/admin/cloudapi
# or from Tailscale admin console
TAILSCALE_AUTH_KEY=tskey-auth-xxxx-xxxx-xxxx-xxxx
TAILSCALE_TAILNET_ID=your-tailnet-id-here
# ===== MESH_VPN NETWORKING =====
# Get your auth key from: https://mesh-vpn.com/admin/cloudapi
# or from Mesh-VPN admin console
MESH_VPN_AUTH_KEY=tskey-auth-xxxx-xxxx-xxxx-xxxx
MESH_VPN_NETWORK_ID=your-mesh-id-here

# ===== RECORDING SETTINGS =====
AUDIO_THRESHOLD_DB=70 # dB threshold for audio-triggered recording
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Examples of unacceptable behavior:
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the project team at j1admin@onebyjorah.com. All complaints will
reported to the project team at security@jorahone.com. All complaints will
be reviewed and investigated and will result in a response that is deemed
necessary and appropriate to the circumstances.

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ for receiving patches depends on the CVSS v3.0 rating:

## Reporting a Vulnerability

Please report security vulnerabilities to **j1admin@onebyjorah.com**. Do NOT
Please report security vulnerabilities to **security@jorahone.com**. Do NOT
report security vulnerabilities through public GitHub issues.

You should receive a response within 48 hours. If for some reason you do not,
Expand Down
10 changes: 5 additions & 5 deletions backend/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:5000")
ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "localhost,127.0.0.1").split(",")

# Tailscale Support
TAILSCALE_ENABLED = os.getenv("TAILSCALE_ENABLED", "false").lower() == "true"
TAILSCALE_API_KEY = os.getenv("TAILSCALE_API_KEY", "")
TAILSCALE_GROUP = os.getenv("TAILSCALE_GROUP", "rtsp-nvr")
TAILSCALE_SUBNET_Routes = os.getenv("TAILSCALE_SUBNET_ROUTES", "")
# Mesh-VPN Support
MESH_VPN_ENABLED = os.getenv("MESH_VPN_ENABLED", "false").lower() == "true"
MESH_VPN_API_KEY = os.getenv("MESH_VPN_API_KEY", "")
MESH_VPN_GROUP = os.getenv("MESH_VPN_GROUP", "rtsp-nvr")
MESH_VPN_SUBNET_Routes = os.getenv("MESH_VPN_SUBNET_ROUTES", "")

# ===== CORS =====
CORS_ORIGINS = os.getenv("CORS_ORIGINS", FRONTEND_URL).split(",")
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ services:
- REDIS_URL=redis://redis:6379
- SECRET_KEY=${SECRET_KEY:-change-this-to-a-random-secret}
- JWT_SECRET_KEY=${JWT_SECRET_KEY:-change-this-jwt-secret}
- TAILSCALE_API_KEY=${TAILSCALE_API_KEY:-}
- TAILSCALE_TAILNET_ID=${TAILSCALE_TAILNET_ID:-}
- MESH_VPN_API_KEY=${MESH_VPN_API_KEY:-}
- MESH_VPN_NETWORK_ID=${MESH_VPN_NETWORK_ID:-}
- WEBSOCKET_ENABLED=true
- LOG_LEVEL=INFO
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { api } from '../api';

const Settings = () => {
const [activeTab, setActiveTab] = useState('general');
const [config, setConfig] = useState({ audioThreshold: 70, retentionDays: 7, username: '', password: '', tailscaleApiKey: '' });
const [config, setConfig] = useState({ audioThreshold: 70, retentionDays: 7, username: '', password: '', mesh-vpnApiKey: '' });
const [loading, setLoading] = useState(false);
const [streams, setStreams] = useState([]);
const [schedules, setSchedules] = useState([]);
Expand Down
8 changes: 4 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ BACKEND_URL=http://backend:5000
# Redis
REDIS_URL=redis://redis:6379

# Tailscale (optional)
TAILSCALE_API_KEY=
TAILSCALE_TAILNET_ID=
TAILSCALE_AUTH_KEY=
# Mesh-VPN (optional)
MESH_VPN_API_KEY=
MESH_VPN_NETWORK_ID=
MESH_VPN_AUTH_KEY=

# Recording
AUDIO_THRESHOLD_DB=70
Expand Down
2 changes: 1 addition & 1 deletion j1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ last_publish: null
standards_version: "2.1"
dependencies: []
deploy_target: scratch
tailscale_only: false
mesh_vpn_only: false
public_facing: false
community_sla_hours: 48
adoption_tracked: false
Loading