Merge dev into main #22
@@ -30,6 +30,10 @@ VPS_SSH_KEY_PATH = os.environ.get("VPS_SSH_KEY_PATH", "/app/ssh/vps_id_ed25519")
|
|||||||
CADDY_VPS_SSH_HOST = os.environ.get("CADDY_VPS_SSH_HOST", "161.33.182.109")
|
CADDY_VPS_SSH_HOST = os.environ.get("CADDY_VPS_SSH_HOST", "161.33.182.109")
|
||||||
CADDY_VPS_SSH_USER = os.environ.get("CADDY_VPS_SSH_USER", "ubuntu")
|
CADDY_VPS_SSH_USER = os.environ.get("CADDY_VPS_SSH_USER", "ubuntu")
|
||||||
|
|
||||||
|
MAC_SSH_HOST = os.environ.get("MAC_SSH_HOST", "192.168.31.22")
|
||||||
|
MAC_SSH_USER = os.environ.get("MAC_SSH_USER", "jimmyg")
|
||||||
|
MAC_SSH_KEY_PATH = os.environ.get("MAC_SSH_KEY_PATH", "/app/ssh/mac_id_ed25519")
|
||||||
|
|
||||||
# Telegram notifications
|
# Telegram notifications
|
||||||
TELEGRAM_BOT_TOKEN = os.environ.get("TELEGRAM_BOT_TOKEN", "")
|
TELEGRAM_BOT_TOKEN = os.environ.get("TELEGRAM_BOT_TOKEN", "")
|
||||||
TELEGRAM_CHAT_ID = os.environ.get("TELEGRAM_CHAT_ID", "")
|
TELEGRAM_CHAT_ID = os.environ.get("TELEGRAM_CHAT_ID", "")
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ HOSTS = {
|
|||||||
"nas": {"host": config.SSH_HOST, "user": config.SSH_USER, "key": config.SSH_KEY_PATH},
|
"nas": {"host": config.SSH_HOST, "user": config.SSH_USER, "key": config.SSH_KEY_PATH},
|
||||||
"vps": {"host": config.VPS_SSH_HOST, "user": config.VPS_SSH_USER, "key": config.VPS_SSH_KEY_PATH},
|
"vps": {"host": config.VPS_SSH_HOST, "user": config.VPS_SSH_USER, "key": config.VPS_SSH_KEY_PATH},
|
||||||
"caddy-vps": {"host": config.CADDY_VPS_SSH_HOST, "user": config.CADDY_VPS_SSH_USER, "key": config.VPS_SSH_KEY_PATH},
|
"caddy-vps": {"host": config.CADDY_VPS_SSH_HOST, "user": config.CADDY_VPS_SSH_USER, "key": config.VPS_SSH_KEY_PATH},
|
||||||
|
"mac": {"host": config.MAC_SSH_HOST, "user": config.MAC_SSH_USER, "key": config.MAC_SSH_KEY_PATH},
|
||||||
"claude-dev": {"host": config.SSH_HOST, "user": config.SSH_USER, "key": config.SSH_KEY_PATH,
|
"claude-dev": {"host": config.SSH_HOST, "user": config.SSH_USER, "key": config.SSH_KEY_PATH,
|
||||||
"command": "/volume1/@appstore/ContainerManager/usr/bin/docker exec -it claude-dev bash"},
|
"command": "/volume1/@appstore/ContainerManager/usr/bin/docker exec -it claude-dev bash"},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ services:
|
|||||||
- SSH_USER=zjgump
|
- SSH_USER=zjgump
|
||||||
- VPS_SSH_HOST=158.101.140.85
|
- VPS_SSH_HOST=158.101.140.85
|
||||||
- VPS_SSH_USER=jimmyg
|
- VPS_SSH_USER=jimmyg
|
||||||
|
- CADDY_VPS_SSH_HOST=161.33.182.109
|
||||||
|
- CADDY_VPS_SSH_USER=ubuntu
|
||||||
|
- MAC_SSH_HOST=192.168.31.22
|
||||||
|
- MAC_SSH_USER=jimmyg
|
||||||
- SECRET_KEY=${SECRET_KEY}
|
- SECRET_KEY=${SECRET_KEY}
|
||||||
- ADMIN_USER=jimmy
|
- ADMIN_USER=jimmy
|
||||||
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
||||||
@@ -27,6 +31,7 @@ services:
|
|||||||
- /volume1:/volume1
|
- /volume1:/volume1
|
||||||
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro
|
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro
|
||||||
- /volume1/docker/nas-dashboard/ssh/vps_terminal:/app/ssh/vps_id_ed25519:ro
|
- /volume1/docker/nas-dashboard/ssh/vps_terminal:/app/ssh/vps_id_ed25519:ro
|
||||||
|
- /volume1/docker/nas-dashboard/ssh/mac_terminal:/app/ssh/mac_id_ed25519:ro
|
||||||
- /volume1/docker/nas-dashboard/ssh/known_hosts:/app/ssh/known_hosts:ro
|
- /volume1/docker/nas-dashboard/ssh/known_hosts:/app/ssh/known_hosts:ro
|
||||||
- /volume1/docker/chat-summarizer/data:/app/data/chat-summarizer:ro
|
- /volume1/docker/chat-summarizer/data:/app/data/chat-summarizer:ro
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -36,6 +36,10 @@ services:
|
|||||||
- SSH_USER=zjgump
|
- SSH_USER=zjgump
|
||||||
- VPS_SSH_HOST=158.101.140.85
|
- VPS_SSH_HOST=158.101.140.85
|
||||||
- VPS_SSH_USER=jimmyg
|
- VPS_SSH_USER=jimmyg
|
||||||
|
- CADDY_VPS_SSH_HOST=161.33.182.109
|
||||||
|
- CADDY_VPS_SSH_USER=ubuntu
|
||||||
|
- MAC_SSH_HOST=192.168.31.22
|
||||||
|
- MAC_SSH_USER=jimmyg
|
||||||
- SECRET_KEY=${SECRET_KEY}
|
- SECRET_KEY=${SECRET_KEY}
|
||||||
- ADMIN_USER=jimmy
|
- ADMIN_USER=jimmy
|
||||||
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
||||||
@@ -49,6 +53,7 @@ services:
|
|||||||
- /volume1:/volume1
|
- /volume1:/volume1
|
||||||
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro
|
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro
|
||||||
- /volume1/docker/nas-dashboard/ssh/vps_terminal:/app/ssh/vps_id_ed25519:ro
|
- /volume1/docker/nas-dashboard/ssh/vps_terminal:/app/ssh/vps_id_ed25519:ro
|
||||||
|
- /volume1/docker/nas-dashboard/ssh/mac_terminal:/app/ssh/mac_id_ed25519:ro
|
||||||
- /volume1/docker/nas-dashboard/ssh/known_hosts:/app/ssh/known_hosts:ro
|
- /volume1/docker/nas-dashboard/ssh/known_hosts:/app/ssh/known_hosts:ro
|
||||||
- /volume1/docker/chat-summarizer/data:/app/data/chat-summarizer:ro
|
- /volume1/docker/chat-summarizer/data:/app/data/chat-summarizer:ro
|
||||||
- /volume1/docker/info-engine/data:/app/data/info-engine:ro
|
- /volume1/docker/info-engine/data:/app/data/info-engine:ro
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
{ id: "nas", label: "NAS" },
|
{ id: "nas", label: "NAS" },
|
||||||
{ id: "vps", label: "VPS" },
|
{ id: "vps", label: "VPS" },
|
||||||
{ id: "caddy-vps", label: "Caddy VPS" },
|
{ id: "caddy-vps", label: "Caddy VPS" },
|
||||||
|
{ id: "mac", label: "Mac" },
|
||||||
{ id: "claude-dev", label: "Claude Dev" },
|
{ id: "claude-dev", label: "Claude Dev" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user