Claude
d8558eca89
Introduce timetracker/config.py with a single config() helper that resolves settings from a fixed priority chain: NAME__FILE (opt-in secret) -> env var -> .env -> settings.ini -> in-code default. Supports type casting (bool/list/int/Path), file-based secrets with .strip(), and required_in_prod validation. Migrate settings.py off the previous ad-hoc idioms: - DEBUG via config() (PROD kept as deprecated alias) - SECRET_KEY required in prod, supports SECRET_KEY__FILE - APP_URL derives ALLOWED_HOSTS and CSRF_TRUSTED_ORIGINS (kept separate, each independently overridable); ALLOWED_HOSTS is now configurable - TZ and DATA_DIR via config() Fix DATA_DIR inconsistency: entrypoint.sh now reads DATA_DIR (was hardcoded) so the bash bootstrap and Django agree on the database directory. Document the container/entrypoint-only flags (PUID/PGID/ CREATE_DEFAULT_SUPERUSER/STAGING/LOAD_SAMPLE_DATA) as bash concerns. Update deployment configs to set APP_URL (and DEBUG), add docs/configuration.md, settings.ini.example, regrouped .env.example, CLAUDE.md, and tests. https://claude.ai/code/session_01FFn8BiGrQpEJarC8xGse8s
63 lines
2.2 KiB
Bash
63 lines
2.2 KiB
Bash
#!/bin/bash
|
|
set -euo pipefail
|
|
|
|
# Container-bootstrap configuration. These variables are consumed only by this
|
|
# entrypoint, NOT by Django (see timetracker/config.py for the app settings):
|
|
# PUID/PGID — uid/gid the container process runs as
|
|
# DATA_DIR — writable dir for the SQLite database (kept in
|
|
# sync with Django via the same env var + default)
|
|
# CREATE_DEFAULT_SUPERUSER — create an admin/admin user on first start
|
|
# STAGING / LOAD_SAMPLE_DATA — staging-only data bootstrap (see below)
|
|
PUID=${PUID:-1000}
|
|
PGID=${PGID:-100}
|
|
DATA_DIR=${DATA_DIR:-/home/timetracker/app/data}
|
|
|
|
USERHOME=$(grep timetracker /etc/passwd | cut -d ":" -f6)
|
|
usermod -d "/root" timetracker
|
|
groupmod -o -g "$PGID" timetracker
|
|
usermod -o -u "$PUID" timetracker
|
|
usermod -d "${USERHOME}" timetracker
|
|
|
|
mkdir -p "$DATA_DIR" /var/log/supervisor
|
|
chmod 755 /home/timetracker/app
|
|
chmod 755 /home/timetracker/app/.venv
|
|
|
|
chown "$PUID:$PGID" "$DATA_DIR"
|
|
chown "$PUID:$PGID" /var/log/supervisor
|
|
|
|
python manage.py migrate
|
|
python manage.py collectstatic --clear --no-input
|
|
|
|
# Staging seeded from a production snapshot: remove copied sessions and the
|
|
# inherited django-q schedule/queue so staging neither shares prod's session
|
|
# cookies nor independently runs scheduled tasks (see issue #20).
|
|
if [ "${STAGING:-false}" = "true" ]; then
|
|
python manage.py scrub_staging
|
|
fi
|
|
|
|
# Public staging with a fresh database (e.g. Fly.io): load demo data instead
|
|
# of any production snapshot. Runs once while the games table is empty.
|
|
if [ "${LOAD_SAMPLE_DATA:-false}" = "true" ]; then
|
|
python manage.py shell -c "
|
|
from games.models import Game
|
|
from django.core.management import call_command
|
|
if not Game.objects.exists():
|
|
call_command('loaddata', 'sample.yaml')
|
|
print('Loaded sample data.')
|
|
"
|
|
fi
|
|
|
|
if [ "${CREATE_DEFAULT_SUPERUSER:-false}" = "true" ]; then
|
|
python manage.py shell -c "
|
|
from django.contrib.auth import get_user_model
|
|
User = get_user_model()
|
|
if not User.objects.filter(username='admin').exists():
|
|
User.objects.create_superuser('admin', '', 'admin')
|
|
print('Created default superuser: admin / admin')
|
|
"
|
|
fi
|
|
|
|
chown -R "$PUID:$PGID" "$DATA_DIR"
|
|
|
|
exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisor.conf
|