Lege Tsumugu auf freie Pi-Ports 3007/8007 und 3094/8094.
8006 und 8095 sind bereits durch BuyingAgent belegt. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
544c44ca04
commit
353001d819
9 files changed
+30
-30
No files matched your search
+4
-4
@@ -10,10 +10,10 @@
|
||||
# DB_USER=tsumugu_dev
|
||||
# DB_PASSWORD=dev_password_change_me
|
||||
# APP_URL=https://dev.tsumugu.jinkendo.de
|
||||
# ALLOWED_ORIGINS=https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3095
|
||||
# ALLOWED_ORIGINS=https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3094
|
||||
# TSUMUGU_ENV=development
|
||||
# TSUMUGU_FRONTEND_PORT=3095
|
||||
# TSUMUGU_BACKEND_PORT=8095
|
||||
# TSUMUGU_FRONTEND_PORT=3094
|
||||
# TSUMUGU_BACKEND_PORT=8094
|
||||
|
||||
# ─── PROD (docker-compose.yml) ───────────────────────────────────────────────
|
||||
DB_NAME=tsumugu
|
||||
@@ -23,4 +23,4 @@ APP_URL=https://tsumugu.jinkendo.de
|
||||
ALLOWED_ORIGINS=https://tsumugu.jinkendo.de
|
||||
TSUMUGU_ENV=production
|
||||
TSUMUGU_FRONTEND_PORT=3007
|
||||
TSUMUGU_BACKEND_PORT=8006
|
||||
TSUMUGU_BACKEND_PORT=8007
|
||||
@@ -30,10 +30,10 @@ jobs:
|
||||
'DB_USER=tsumugu_dev' \
|
||||
'DB_PASSWORD=dev_password_change_me' \
|
||||
'APP_URL=https://dev.tsumugu.jinkendo.de' \
|
||||
'ALLOWED_ORIGINS=https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3095' \
|
||||
'ALLOWED_ORIGINS=https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3094' \
|
||||
'TSUMUGU_ENV=development' \
|
||||
'TSUMUGU_FRONTEND_PORT=3095' \
|
||||
'TSUMUGU_BACKEND_PORT=8095' \
|
||||
'TSUMUGU_FRONTEND_PORT=3094' \
|
||||
'TSUMUGU_BACKEND_PORT=8094' \
|
||||
> .env
|
||||
echo "created $TARGET/.env from dev defaults"
|
||||
umask 022
|
||||
@@ -45,11 +45,11 @@ jobs:
|
||||
docker compose -f docker-compose.dev-env.yml ps || true
|
||||
exit 1
|
||||
fi
|
||||
if ! curl -sf http://localhost:8095/api/health; then
|
||||
if ! curl -sf http://localhost:8094/api/health; then
|
||||
echo "DEV API not reachable — backend logs:"
|
||||
docker compose -f docker-compose.dev-env.yml logs backend --tail 150 || true
|
||||
exit 1
|
||||
fi
|
||||
echo "DEV API /api/health OK"
|
||||
curl -sf http://localhost:3095/api/health && echo "DEV frontend proxy /api/health OK"
|
||||
curl -sf http://localhost:3094/api/health && echo "DEV frontend proxy /api/health OK"
|
||||
echo "=== Tsumugu DEV deploy complete ==="
|
||||
@@ -34,7 +34,7 @@ jobs:
|
||||
'ALLOWED_ORIGINS=https://tsumugu.jinkendo.de' \
|
||||
'TSUMUGU_ENV=production' \
|
||||
'TSUMUGU_FRONTEND_PORT=3007' \
|
||||
'TSUMUGU_BACKEND_PORT=8006' \
|
||||
'TSUMUGU_BACKEND_PORT=8007' \
|
||||
> .env
|
||||
unset PASS
|
||||
echo "created $TARGET/.env (password not logged)"
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
docker compose ps || true
|
||||
exit 1
|
||||
fi
|
||||
if ! curl -sf http://localhost:8006/api/health; then
|
||||
if ! curl -sf http://localhost:8007/api/health; then
|
||||
echo "PROD API not reachable — backend logs:"
|
||||
docker compose logs backend --tail 150 || true
|
||||
exit 1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Tsumugu
|
||||
|
||||
Neues Projekt der Jinkendo-Familie, neben Mitai, Shinkan, Kairo und Kanshō.
|
||||
Neues Projekt der Jinkendo-Familie, neben Mitai, Shinkan, Kairo und Kanshō. Alles, was zusammengehört: universelles Vorgangs- und Informationsmanagement.
|
||||
|
||||
Remote: `http://192.168.2.144:3000/Lars/tsumugu.git`
|
||||
|
||||
@@ -12,7 +12,7 @@ Das Repository enthält das Deploy-Gerüst. Ein Push auf `develop` baut und star
|
||||
|---|---|---|
|
||||
| Branch | `develop` | `main` |
|
||||
| Verzeichnis | `/home/lars/docker/tsumugu-dev` | `/home/lars/docker/tsumugu` |
|
||||
| LAN | http://192.168.2.49:3095 | http://192.168.2.49:3007 |
|
||||
| LAN | http://192.168.2.49:3094 | http://192.168.2.49:3007 |
|
||||
| Öffentlich | https://dev.tsumugu.jinkendo.de | https://tsumugu.jinkendo.de |
|
||||
|
||||
Details, Ports und der Synology-Reverse-Proxy: `docs/DEPLOYMENT.md`.
|
||||
|
||||
@@ -31,9 +31,9 @@ services:
|
||||
DB_USER: "${DB_USER:-tsumugu_dev}"
|
||||
DB_PASSWORD: "${DB_PASSWORD:-dev_password_change_me}"
|
||||
APP_URL: "${APP_URL:-https://dev.tsumugu.jinkendo.de}"
|
||||
ALLOWED_ORIGINS: "${ALLOWED_ORIGINS:-https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3095,http://localhost:3095}"
|
||||
ALLOWED_ORIGINS: "${ALLOWED_ORIGINS:-https://dev.tsumugu.jinkendo.de,http://192.168.2.49:3094,http://localhost:3094}"
|
||||
ports:
|
||||
- "${TSUMUGU_BACKEND_PORT:-8095}:8000"
|
||||
- "${TSUMUGU_BACKEND_PORT:-8094}:8000"
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
@@ -58,7 +58,7 @@ services:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
ports:
|
||||
- "${TSUMUGU_FRONTEND_PORT:-3095}:80"
|
||||
- "${TSUMUGU_FRONTEND_PORT:-3094}:80"
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ services:
|
||||
APP_URL: "${APP_URL:-https://tsumugu.jinkendo.de}"
|
||||
ALLOWED_ORIGINS: "${ALLOWED_ORIGINS:-https://tsumugu.jinkendo.de}"
|
||||
ports:
|
||||
- "${TSUMUGU_BACKEND_PORT:-8006}:8000"
|
||||
- "${TSUMUGU_BACKEND_PORT:-8007}:8000"
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
|
||||
+9
-9
@@ -13,14 +13,14 @@ Unter `/home/lars/docker/` legt der Lauf nur diese zwei Verzeichnisse an:
|
||||
|---|------------|-------------|
|
||||
| **Git-Branch** | `main` | `develop` |
|
||||
| **Server-Verzeichnis** | `/home/lars/docker/tsumugu` | `/home/lars/docker/tsumugu-dev` |
|
||||
| **Frontend-Port** | 3007 | 3095 |
|
||||
| **Backend-Port** | 8006 | 8095 |
|
||||
| **Frontend-Port** | 3007 | 3094 |
|
||||
| **Backend-Port** | 8007 | 8094 |
|
||||
| **PostgreSQL** | nur Compose-Netz, DB `tsumugu` | nur Compose-Netz, DB `tsumugu_dev` |
|
||||
| **Domain** | tsumugu.jinkendo.de | dev.tsumugu.jinkendo.de |
|
||||
| **Öffentliche URL** | https://tsumugu.jinkendo.de | https://dev.tsumugu.jinkendo.de |
|
||||
| **Compose** | `docker-compose.yml` | `docker-compose.dev-env.yml` |
|
||||
|
||||
3005 ist auf dem Pi durch Bookstack belegt, 3006/8005 und 3096/8096 durch Kanshō. 3002–3004 und 3097–3099 gehören Mitai, Shinkan und Kairo. Tsumugu nimmt deshalb 3007/8006 und 3095/8095.
|
||||
3005 ist auf dem Pi durch Bookstack belegt, 3006/8005 und 3096/8096 durch Kanshō. 3002–3004 und 3097–3099 gehören Mitai, Shinkan und Kairo. BuyingAgent hält 8006 und 8095. Tsumugu nimmt deshalb 3007/8007 und 3094/8094.
|
||||
|
||||
---
|
||||
|
||||
@@ -28,8 +28,8 @@ Unter `/home/lars/docker/` legt der Lauf nur diese zwei Verzeichnisse an:
|
||||
|
||||
| Workflow | Trigger | Zweck |
|
||||
|----------|---------|--------|
|
||||
| `deploy-dev.yml` | Push `develop` | Deploy nach `/home/lars/docker/tsumugu-dev`, Health `localhost:8095` und `localhost:3095` |
|
||||
| `deploy-prod.yml` | Push `main` | Deploy nach `/home/lars/docker/tsumugu`, Health `localhost:8006` und `localhost:3007` |
|
||||
| `deploy-dev.yml` | Push `develop` | Deploy nach `/home/lars/docker/tsumugu-dev`, Health `localhost:8094` und `localhost:3094` |
|
||||
| `deploy-prod.yml` | Push `main` | Deploy nach `/home/lars/docker/tsumugu`, Health `localhost:8007` und `localhost:3007` |
|
||||
|
||||
Gearbeitet wird auf `develop`. Production entsteht nur durch einen Merge-Commit `develop` → `main` (`git merge --no-ff develop` auf `main`) und den anschließenden Push von `main`. Kein Fast-Forward, kein direkter Commit auf `main`, kein manuelles `git pull` auf dem Prod-Checkout. Gitea (`deploy-prod.yml`) ist der einzige Prod-Schreibpfad für Code.
|
||||
|
||||
@@ -43,12 +43,12 @@ TLS endet wie bei Kanshō auf dem Synology-NAS `192.168.2.63` (DSM Reverse Proxy
|
||||
|
||||
| Domain | Ziel |
|
||||
|--------|------|
|
||||
| `dev.tsumugu.jinkendo.de` | `http://192.168.2.49:3095` |
|
||||
| `dev.tsumugu.jinkendo.de` | `http://192.168.2.49:3094` |
|
||||
| `tsumugu.jinkendo.de` | `http://192.168.2.49:3007` |
|
||||
|
||||
DNS bzw. AdGuard-Rewrite für beide Namen auf `192.168.2.63`. Im DSM-Reverse-Proxy Lese- und Sende-Timeout auf 600s setzen. Bis die Regeln stehen, bleibt der LAN-Zugriff über die Publish-Ports:
|
||||
|
||||
- Development: `http://192.168.2.49:3095`
|
||||
- Development: `http://192.168.2.49:3094`
|
||||
- Production: `http://192.168.2.49:3007`
|
||||
|
||||
`nginx/tsumugu.conf` und `nginx/tsumugu-dev.conf` sind die Host-nginx-Variante, falls TLS später auf dem Pi endet. Sie sind nicht der aktuelle Pfad.
|
||||
@@ -63,12 +63,12 @@ cd /home/lars/docker/tsumugu-dev
|
||||
git fetch origin develop && git reset --hard origin/develop
|
||||
docker compose -f docker-compose.dev-env.yml build --no-cache backend frontend
|
||||
docker compose -f docker-compose.dev-env.yml up -d --wait
|
||||
curl -sf http://localhost:8095/api/health
|
||||
curl -sf http://localhost:8094/api/health
|
||||
|
||||
# Production
|
||||
cd /home/lars/docker/tsumugu
|
||||
git fetch origin main && git reset --hard origin/main
|
||||
docker compose build --no-cache backend frontend
|
||||
docker compose up -d --wait
|
||||
curl -sf http://localhost:8006/api/health
|
||||
curl -sf http://localhost:8007/api/health
|
||||
```
|
||||
@@ -1,6 +1,6 @@
|
||||
# Tsumugu development vhost. Install as /etc/nginx/sites-available/tsumugu-dev.
|
||||
# Live TLS terminates on the Synology Reverse Proxy at 192.168.2.63.
|
||||
# Point dev.tsumugu.jinkendo.de at http://192.168.2.49:3095.
|
||||
# Point dev.tsumugu.jinkendo.de at http://192.168.2.49:3094.
|
||||
# Set DSM proxy read/send timeout to 600s.
|
||||
|
||||
server {
|
||||
@@ -33,7 +33,7 @@ server {
|
||||
client_max_body_size 80m;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8095;
|
||||
proxy_pass http://127.0.0.1:8094;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
@@ -43,7 +43,7 @@ server {
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:3095;
|
||||
proxy_pass http://127.0.0.1:3094;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ server {
|
||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8006;
|
||||
proxy_pass http://127.0.0.1:8007;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
|
||||
Reference in new issue
Block a user