Compare commits
5 Commits
feat/admin
...
deaf13c724
| Author | SHA1 | Date | |
|---|---|---|---|
| deaf13c724 | |||
| a02f7ec511 | |||
| c010bc22a0 | |||
| 66da5b708a | |||
| 1e31aa535e |
@@ -51,16 +51,23 @@ Create a file named `.env` in the **project root** (same folder as
|
|||||||
POSTGRES_DB=wpsuite
|
POSTGRES_DB=wpsuite
|
||||||
POSTGRES_USER=wpsuite
|
POSTGRES_USER=wpsuite
|
||||||
POSTGRES_PASSWORD=<strong-random-password>
|
POSTGRES_PASSWORD=<strong-random-password>
|
||||||
|
|
||||||
# Must match the POSTGRES_* values above. Host is the compose service name "db".
|
|
||||||
DATABASE_URL=postgresql+psycopg://wpsuite:<strong-random-password>@db:5432/wpsuite
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
That's it — the API now builds its own connection string from these three
|
||||||
|
values and **encodes the password automatically**, so a password with special
|
||||||
|
characters (`@ ! # : /` …) works without any manual escaping. `DATABASE_URL`
|
||||||
|
is **optional** and only needed if you want to point the API at some other
|
||||||
|
database; if you do set it, you must URL-encode the password yourself, and it's
|
||||||
|
ignored whenever the three `POSTGRES_*` values are present.
|
||||||
|
|
||||||
Generate a strong password with `openssl rand -base64 32`.
|
Generate a strong password with `openssl rand -base64 32`.
|
||||||
|
|
||||||
These are the only credentials in the system: the `db` container initialises
|
> **Portainer note:** for a Git-based stack these go in the stack's
|
||||||
Postgres from `POSTGRES_*`, and the `api` container connects with the matching
|
> **Environment variables** section (Portainer doesn't read a local `.env`).
|
||||||
`DATABASE_URL`. Neither value appears in the compose file or in git.
|
> Set `POSTGRES_DB` / `POSTGRES_USER` / `POSTGRES_PASSWORD` there.
|
||||||
|
|
||||||
|
These are the only credentials in the system, and they never appear in the
|
||||||
|
compose file or in git.
|
||||||
|
|
||||||
## 3. Point your reverse proxy at the nginx container
|
## 3. Point your reverse proxy at the nginx container
|
||||||
|
|
||||||
|
|||||||
@@ -4,5 +4,7 @@ COPY server/requirements.txt ./server/
|
|||||||
RUN pip install --no-cache-dir -r server/requirements.txt
|
RUN pip install --no-cache-dir -r server/requirements.txt
|
||||||
COPY server/ ./server/
|
COPY server/ ./server/
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
CMD ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", \
|
# --preload imports the app once in the master (so create_all runs a single time)
|
||||||
|
# before forking workers, preventing a table-creation race on first startup.
|
||||||
|
CMD ["gunicorn", "-k", "uvicorn.workers.UvicornWorker", "--preload", \
|
||||||
"-b", "0.0.0.0:8000", "--workers", "2", "server.app:app"]
|
"-b", "0.0.0.0:8000", "--workers", "2", "server.app:app"]
|
||||||
@@ -19,7 +19,14 @@ services:
|
|||||||
build: .
|
build: .
|
||||||
container_name: wp_api
|
container_name: wp_api
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: ${DATABASE_URL}
|
# Preferred: the API builds its own connection string from these and
|
||||||
|
# encodes the password automatically (no manual URL-encoding needed).
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB}
|
||||||
|
POSTGRES_HOST: db
|
||||||
|
# Optional full-URL override (must be URL-encoded if used).
|
||||||
|
DATABASE_URL: ${DATABASE_URL:-}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
|
|||||||
@@ -471,7 +471,7 @@
|
|||||||
|
|
||||||
<!-- FOOTER -->
|
<!-- FOOTER -->
|
||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
<p>Work Package Suite v1.0 | Prime Controls | All files work offline with local browser storage</p>
|
<p>Work Package Suite v1.0 | Prime Controls - Business Technology Group | Pilot Use Only</p>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script src="feedback-config.js"></script>
|
<script src="feedback-config.js"></script>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name _;
|
server_name wp.controls.dev;
|
||||||
|
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|||||||
43
server/db.py
43
server/db.py
@@ -1,28 +1,49 @@
|
|||||||
"""Database engine and session setup.
|
"""Database engine and session setup.
|
||||||
|
|
||||||
The connection string comes from the DATABASE_URL environment variable, e.g.
|
Connection precedence:
|
||||||
postgresql+psycopg://wpsuite:secret@db-host:5432/wpsuite
|
1. POSTGRES_USER + POSTGRES_PASSWORD + POSTGRES_DB (preferred) — the URL is
|
||||||
|
built with SQLAlchemy's URL.create(), which encodes the password for you,
|
||||||
|
so passwords with special characters (@ ! # : / …) need NO manual escaping.
|
||||||
|
Host/port default to POSTGRES_HOST=db / POSTGRES_PORT=5432.
|
||||||
|
2. DATABASE_URL — a full SQLAlchemy URL, if you'd rather supply one directly
|
||||||
|
(you must URL-encode any special characters in the password yourself).
|
||||||
|
3. Neither set → a local SQLite file, so the API runs anywhere without Postgres.
|
||||||
|
|
||||||
If unset, it falls back to a local SQLite file so the API can be run and tested
|
The schema is identical either way (SQLAlchemy handles dialect differences).
|
||||||
on any machine without Postgres. The schema is identical either way (SQLAlchemy
|
|
||||||
handles the dialect differences).
|
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine, URL
|
||||||
from sqlalchemy.orm import sessionmaker, DeclarativeBase
|
from sqlalchemy.orm import sessionmaker, DeclarativeBase
|
||||||
|
|
||||||
# Load a local .env if present (dev convenience). In production the DATABASE_URL
|
# Load a local .env if present (dev convenience).
|
||||||
# normally comes from the systemd unit's Environment / EnvironmentFile instead.
|
|
||||||
try:
|
try:
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
DATABASE_URL = os.getenv("DATABASE_URL", "sqlite:///./wpsuite.db")
|
|
||||||
|
|
||||||
# SQLite needs this flag to be used from FastAPI's threadpool; Postgres ignores it.
|
def _resolve_url():
|
||||||
connect_args = {"check_same_thread": False} if DATABASE_URL.startswith("sqlite") else {}
|
user = os.getenv("POSTGRES_USER")
|
||||||
|
pw = os.getenv("POSTGRES_PASSWORD")
|
||||||
|
dbname = os.getenv("POSTGRES_DB")
|
||||||
|
if user and pw and dbname:
|
||||||
|
# Build from components — password is encoded automatically.
|
||||||
|
return URL.create(
|
||||||
|
"postgresql+psycopg",
|
||||||
|
username=user, password=pw,
|
||||||
|
host=os.getenv("POSTGRES_HOST", "db"),
|
||||||
|
port=int(os.getenv("POSTGRES_PORT", "5432")),
|
||||||
|
database=dbname,
|
||||||
|
)
|
||||||
|
return os.getenv("DATABASE_URL") or "sqlite:///./wpsuite.db"
|
||||||
|
|
||||||
|
|
||||||
|
DATABASE_URL = _resolve_url()
|
||||||
|
|
||||||
|
# SQLite needs this flag from FastAPI's threadpool; Postgres ignores it.
|
||||||
|
_is_sqlite = isinstance(DATABASE_URL, str) and DATABASE_URL.startswith("sqlite")
|
||||||
|
connect_args = {"check_same_thread": False} if _is_sqlite else {}
|
||||||
|
|
||||||
engine = create_engine(DATABASE_URL, connect_args=connect_args, pool_pre_ping=True, future=True)
|
engine = create_engine(DATABASE_URL, connect_args=connect_args, pool_pre_ping=True, future=True)
|
||||||
SessionLocal = sessionmaker(bind=engine, autoflush=False, autocommit=False, future=True)
|
SessionLocal = sessionmaker(bind=engine, autoflush=False, autocommit=False, future=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user