fix(deployments): fix broken config mount and expand env example
- Fix docker-compose.yaml: mount config.dev.yaml instead of nonexistent configs/config.yaml - Add deployments/config.dev.yaml with Docker service names and dev defaults for zero-setup make docker-up - Expand .env.example with all SILO_* and LDAP_* variables - Update config.example.yaml hostnames to localhost with Docker comments - Add deployments/config.docker.yaml to .gitignore (generated file)
This commit is contained in:
24
.env.example
24
.env.example
@@ -1,12 +1,26 @@
|
||||
# Silo Environment Configuration
|
||||
# Copy this file to .env and update values as needed
|
||||
# Copy to .env (or deployments/.env) and update values as needed.
|
||||
# For automated setup, run: ./scripts/setup-docker.sh
|
||||
|
||||
# PostgreSQL
|
||||
POSTGRES_PASSWORD=silodev
|
||||
|
||||
# MinIO
|
||||
MINIO_ACCESS_KEY=minioadmin
|
||||
MINIO_SECRET_KEY=minioadmin
|
||||
MINIO_ACCESS_KEY=silominio
|
||||
MINIO_SECRET_KEY=silominiosecret
|
||||
|
||||
# Silo API (optional overrides)
|
||||
# SILO_SERVER_PORT=8080
|
||||
# OpenLDAP
|
||||
LDAP_ADMIN_PASSWORD=ldapadmin
|
||||
LDAP_USERS=siloadmin
|
||||
LDAP_PASSWORDS=siloadmin
|
||||
|
||||
# Silo Authentication
|
||||
SILO_SESSION_SECRET=change-me-in-production
|
||||
SILO_ADMIN_USERNAME=admin
|
||||
SILO_ADMIN_PASSWORD=admin
|
||||
|
||||
# Optional: OIDC (Keycloak)
|
||||
# SILO_OIDC_CLIENT_SECRET=
|
||||
|
||||
# Optional: LDAP service account
|
||||
# SILO_LDAP_BIND_PASSWORD=
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -29,6 +29,7 @@ Thumbs.db
|
||||
# Config with secrets
|
||||
config.yaml
|
||||
*.env
|
||||
deployments/config.docker.yaml
|
||||
|
||||
# Python
|
||||
__pycache__/
|
||||
|
||||
@@ -8,20 +8,20 @@ server:
|
||||
# read_only: false # Reject all write operations; toggle at runtime with SIGUSR1
|
||||
|
||||
database:
|
||||
host: "psql.example.internal"
|
||||
host: "localhost" # Use "postgres" for Docker Compose
|
||||
port: 5432
|
||||
name: "silo"
|
||||
user: "silo"
|
||||
password: "" # Use SILO_DB_PASSWORD env var
|
||||
sslmode: "require"
|
||||
sslmode: "require" # Use "disable" for Docker Compose (internal network)
|
||||
max_connections: 10
|
||||
|
||||
storage:
|
||||
endpoint: "minio.example.internal:9000"
|
||||
endpoint: "localhost:9000" # Use "minio:9000" for Docker Compose
|
||||
access_key: "" # Use SILO_MINIO_ACCESS_KEY env var
|
||||
secret_key: "" # Use SILO_MINIO_SECRET_KEY env var
|
||||
bucket: "silo-files"
|
||||
use_ssl: true
|
||||
use_ssl: true # Use false for Docker Compose (internal network)
|
||||
region: "us-east-1"
|
||||
|
||||
schemas:
|
||||
|
||||
35
deployments/config.dev.yaml
Normal file
35
deployments/config.dev.yaml
Normal file
@@ -0,0 +1,35 @@
|
||||
# Silo Development Configuration
|
||||
# Used by deployments/docker-compose.yaml — works with zero setup via `make docker-up`.
|
||||
# For production Docker installs, run scripts/setup-docker.sh instead.
|
||||
|
||||
server:
|
||||
host: "0.0.0.0"
|
||||
port: 8080
|
||||
base_url: "http://localhost:8080"
|
||||
|
||||
database:
|
||||
host: "postgres"
|
||||
port: 5432
|
||||
name: "silo"
|
||||
user: "silo"
|
||||
password: "${POSTGRES_PASSWORD:-silodev}"
|
||||
sslmode: "disable"
|
||||
max_connections: 10
|
||||
|
||||
storage:
|
||||
endpoint: "minio:9000"
|
||||
access_key: "${MINIO_ACCESS_KEY:-silominio}"
|
||||
secret_key: "${MINIO_SECRET_KEY:-silominiosecret}"
|
||||
bucket: "silo-files"
|
||||
use_ssl: false
|
||||
region: "us-east-1"
|
||||
|
||||
schemas:
|
||||
directory: "/etc/silo/schemas"
|
||||
default: "kindred-rd"
|
||||
|
||||
freecad:
|
||||
uri_scheme: "silo"
|
||||
|
||||
auth:
|
||||
enabled: false
|
||||
@@ -69,7 +69,7 @@ services:
|
||||
- "8080:8080"
|
||||
volumes:
|
||||
- ../schemas:/etc/silo/schemas:ro
|
||||
- ../configs/config.yaml:/etc/silo/config.yaml:ro
|
||||
- ./config.dev.yaml:/etc/silo/config.yaml:ro
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "-qO-", "http://localhost:8080/health"]
|
||||
interval: 10s
|
||||
|
||||
Reference in New Issue
Block a user