Merge remote changes and resolve conflicts

2026-04-27 11:46:57 -05:00
parent 821f954200 7b38a5af31
commit 90e5e0879c
1 changed files with 3 additions and 8 deletions
@@ -48,6 +48,7 @@
 | VM112 | siklos/docker-server | 192.168.88.27 | 4c/12GB | Main Docker host |
 | VM113 | photos | 192.168.88.32 | 4c/16GB | PhotoPrism + Immich (dedicated photo VM) |
 | VM113 | zorin-os | — | 2c/4GB | — |
+| CT200 | gitea | 192.168.88.200 | 1c/512MB | Gitea git server (port 3000) |
 | CT201 | openclaw | 192.168.88.29 | — | AI gateway (Gemini + Telegram bot, port 18789) |
 | CT202 | caddy-proxy | 192.168.88.110 | 2c/4GB | Caddy reverse proxy |
 | VM111 | debian-1 | — | — | Stopped/unused |
@@ -92,7 +93,7 @@
 | notes.jgitta.com | 192.168.88.27:3010 | Karakeep |
 | links.jgitta.com | 192.168.88.27:3015 | Linkwarden |
 | ai.jgitta.com | 192.168.88.27:3000 | Open WebUI |
-| gitea.jgitta.com | 192.168.88.27:3002 | Gitea (Docker on siklos) |
+| gitea.jgitta.com | 192.168.88.27:3002 | — |
 | status.jgitta.com | 192.168.88.27:3001 | Uptime Kuma, internal_only |
 | grafana.jgitta.com | 192.168.88.27:3020 | internal_only |
 | glances.jgitta.com | 192.168.88.27:61208 | internal_only |
@@ -181,8 +182,7 @@ Run as: `sudo sqlite3 /var/lib/jellyfin/data/jellyfin.db "..."`
 If a `Recordings2` library appears, it means LiveTV's recording path in `/etc/jellyfin/livetv.xml` doesn't match the Recordings library path. Fix via API (remove/add paths) rather than editing XML files.

 ## Dotfiles
- Gitea: `http://192.168.88.27:3002/jgitta/dotfiles.git` (Docker on siklos)
- SSH access: `ssh://git@192.168.88.27:2222/jgitta/dotfiles.git` (Gitea SSH on port 2222)
+- Gitea: `http://192.168.88.27:3002/jgitta/dotfiles.git`
 - Token (read/write): `56ac53def371df34d8f9c4b5580b28d4f62ab1ab`
 - Includes: micro config, bash aliases, `update-dotfiles` alias
 - Preferred editor: `micro` (never nano)
@@ -228,11 +228,6 @@ All `*.jgitta.com` subdomains resolve internally to Caddy (192.168.88.110) via M
 - Media: `192.168.88.25:/mnt/big-11t/media` → `/mnt/media`

 **VM112 / Siklos (192.168.88.27)** — all services Docker; compose files at `/srv/docker/<service>/` (RAM reduced to 12GB after photo services migrated out)
- **Gitea** — port 3002 (HTTP), port 2222 (SSH), Docker image `gitea/gitea:latest`
-  - Web: `http://192.168.88.27:3002`
-  - SSH: `ssh://git@192.168.88.27:2222/`
-  - Accessible externally via: `https://gitea.jgitta.com` (Caddy reverse proxy)
-  - Hosts: `homelab-configs` repo, `dotfiles` repo

 **VM113 / photos (192.168.88.32)** — dedicated photo services VM, Docker:
 - PhotoPrism — port 2342, compose `/srv/docker/photoprism/docker-compose.yml`