fix(deploy): Datenbank-Passwort per PGPASSWORD statt in der Verbindungs-URL
Passwörter mit / + = @ (z. B. aus openssl rand -base64) machten DATABASE_URL ungültig
("TypeError: Invalid URL", api und worker im Neustart-Loop). Lokal mit Passwort "Ab/cd+ef=gh9" geprüft.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
86ff5762ff
commit
8ad5d00805
3 files changed
+8
-4
No files matched your search
@@ -21,7 +21,9 @@ x-backend: &backend
|
|||||||
network_mode: host
|
network_mode: host
|
||||||
env_file: ${ENV_FILE:-.env}
|
env_file: ${ENV_FILE:-.env}
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://atm:${POSTGRES_PASSWORD}@127.0.0.1:5432/atm
|
# Password via PGPASSWORD (read by the PostgreSQL driver): any character works; in the URL "/", "+" or "@" break it.
|
||||||
|
DATABASE_URL: postgres://atm@127.0.0.1:5432/atm
|
||||||
|
PGPASSWORD: ${POSTGRES_PASSWORD}
|
||||||
HTTP_PROXY: ${HTTP_PROXY:-}
|
HTTP_PROXY: ${HTTP_PROXY:-}
|
||||||
HTTPS_PROXY: ${HTTPS_PROXY:-}
|
HTTPS_PROXY: ${HTTPS_PROXY:-}
|
||||||
NO_PROXY: ${NO_PROXY:-},localhost,127.0.0.1
|
NO_PROXY: ${NO_PROXY:-},localhost,127.0.0.1
|
||||||
|
|||||||
@@ -26,7 +26,9 @@ x-backend: &backend
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file: ${ENV_FILE:-.env}
|
env_file: ${ENV_FILE:-.env}
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://atm:${POSTGRES_PASSWORD}@db:5432/atm
|
# Password via PGPASSWORD (read by the PostgreSQL driver): any character works; in the URL "/", "+" or "@" break it.
|
||||||
|
DATABASE_URL: postgres://atm@db:5432/atm
|
||||||
|
PGPASSWORD: ${POSTGRES_PASSWORD}
|
||||||
# Player heads (mc-heads.net) go through the proxy; Compose-internal names and the database never do.
|
# Player heads (mc-heads.net) go through the proxy; Compose-internal names and the database never do.
|
||||||
# SFTP to the game server is a direct SSH connection and does not use these variables.
|
# SFTP to the game server is a direct SSH connection and does not use these variables.
|
||||||
HTTP_PROXY: ${HTTP_PROXY:-}
|
HTTP_PROXY: ${HTTP_PROXY:-}
|
||||||
|
|||||||
+2
-2
@@ -63,7 +63,7 @@ Standalone-Variante nutzt deshalb für Build und Betrieb das Host-Netzwerk des L
|
|||||||
nano deploy/.env
|
nano deploy/.env
|
||||||
```
|
```
|
||||||
- `TRUST_PROXY` = IP des Traefik-Servers (nur er darf die Client-IP weitergeben)
|
- `TRUST_PROXY` = IP des Traefik-Servers (nur er darf die Client-IP weitergeben)
|
||||||
- `INGEST_HMAC_SECRET`, `POSTGRES_PASSWORD` (nur Buchstaben und Ziffern, das Passwort steht in einer URL)
|
- `INGEST_HMAC_SECRET` und `POSTGRES_PASSWORD` (z. B. mit `openssl rand -hex 32`; Sonderzeichen sind erlaubt)
|
||||||
- bei Bedarf `HTTP_PROXY`/`HTTPS_PROXY`/`NO_PROXY` (siehe „Ausgehender Proxy“)
|
- bei Bedarf `HTTP_PROXY`/`HTTPS_PROXY`/`NO_PROXY` (siehe „Ausgehender Proxy“)
|
||||||
- `DOMAIN`, `TRAEFIK_*` und `INGEST_ALLOWED_IPS` werden in dieser Variante nicht genutzt (das regelt Traefik selbst, siehe unten)
|
- `DOMAIN`, `TRAEFIK_*` und `INGEST_ALLOWED_IPS` werden in dieser Variante nicht genutzt (das regelt Traefik selbst, siehe unten)
|
||||||
3. **Starten:**
|
3. **Starten:**
|
||||||
@@ -129,7 +129,7 @@ Standalone-Variante nutzt deshalb für Build und Betrieb das Host-Netzwerk des L
|
|||||||
git clone <repo> atm10-stats && cd atm10-stats
|
git clone <repo> atm10-stats && cd atm10-stats
|
||||||
cp deploy/.env.example deploy/.env
|
cp deploy/.env.example deploy/.env
|
||||||
openssl rand -hex 32 # Wert für INGEST_HMAC_SECRET
|
openssl rand -hex 32 # Wert für INGEST_HMAC_SECRET
|
||||||
openssl rand -base64 24 # Wert für POSTGRES_PASSWORD
|
openssl rand -hex 24 # Wert für POSTGRES_PASSWORD
|
||||||
nano deploy/.env # DOMAIN, TRAEFIK_*, INGEST_ALLOWED_IPS, Secrets, optional SFTP_*
|
nano deploy/.env # DOMAIN, TRAEFIK_*, INGEST_ALLOWED_IPS, Secrets, optional SFTP_*
|
||||||
docker compose -f deploy/docker-compose.yml --env-file deploy/.env up -d --build
|
docker compose -f deploy/docker-compose.yml --env-file deploy/.env up -d --build
|
||||||
docker compose -f deploy/docker-compose.yml --env-file deploy/.env ps # api, web, db: healthy
|
docker compose -f deploy/docker-compose.yml --env-file deploy/.env ps # api, web, db: healthy
|
||||||
|
|||||||
Reference in new issue
Block a user