From 4b229aeffd74b68d22cad10f2e0e23295a0871b2 Mon Sep 17 00:00:00 2001 From: Jeff Emmett Date: Wed, 18 Feb 2026 18:57:08 +0000 Subject: [PATCH] Add rData analytics tracking and ecosystem footer link - Inject rdata.online/collect.js tracking script in layout - Add rData link to ecosystem footer Co-Authored-By: Claude Opus 4.6 --- docker-compose.dev.yml | 76 ++++++++++++++++++ docker-compose.yml | 77 +------------------ portal/templates/portal/base.html | 1 + .../templates/portal/shared_space/base.html | 1 + 4 files changed, 79 insertions(+), 76 deletions(-) create mode 100644 docker-compose.dev.yml mode change 100644 => 120000 docker-compose.yml diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..b21aa87 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,76 @@ +services: + postgres: + image: postgres:15-alpine + container_name: rfiles-db + volumes: + - rfiles_postgres_data:/var/lib/postgresql/data + environment: + - POSTGRES_DB=rfiles + - POSTGRES_USER=rfiles + - POSTGRES_PASSWORD=${DB_PASSWORD:-rfiles_dev_password} + ports: + - "5433:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U rfiles -d rfiles"] + interval: 10s + timeout: 5s + retries: 5 + + redis: + image: redis:7-alpine + container_name: rfiles-redis + command: redis-server --requirepass ${REDIS_PASSWORD:-rfiles_redis_dev} + ports: + - "6380:6379" + healthcheck: + test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD:-rfiles_redis_dev}", "ping"] + interval: 10s + timeout: 5s + retries: 5 + + backend: + build: . + container_name: rfiles-api + volumes: + - .:/app + - rfiles_media:/app/media + environment: + - DATABASE_URL=postgresql://rfiles:${DB_PASSWORD:-rfiles_dev_password}@postgres:5432/rfiles + - CELERY_BROKER_URL=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 + - CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 + - DJANGO_SETTINGS_MODULE=config.settings + - DEBUG=True + - ALLOWED_HOSTS=localhost,127.0.0.1,rfiles.online,.rfiles.online + - SHARE_BASE_URL=http://localhost:8000 + ports: + - "8003:8000" + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + command: > + sh -c "python manage.py migrate --noinput && + python manage.py runserver 0.0.0.0:8000" + + celery-worker: + build: . + container_name: rfiles-celery-worker + volumes: + - .:/app + - rfiles_media:/app/media + environment: + - DATABASE_URL=postgresql://rfiles:${DB_PASSWORD:-rfiles_dev_password}@postgres:5432/rfiles + - CELERY_BROKER_URL=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 + - CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 + - DJANGO_SETTINGS_MODULE=config.settings + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + command: celery -A config worker --loglevel=info --concurrency=2 + +volumes: + rfiles_postgres_data: + rfiles_media: diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index d2a25aa..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,76 +0,0 @@ -services: - postgres: - image: postgres:15-alpine - container_name: rfiles-db - volumes: - - rfiles_postgres_data:/var/lib/postgresql/data - environment: - - POSTGRES_DB=rfiles - - POSTGRES_USER=rfiles - - POSTGRES_PASSWORD=${DB_PASSWORD:-rfiles_dev_password} - ports: - - "5433:5432" - healthcheck: - test: ["CMD-SHELL", "pg_isready -U rfiles -d rfiles"] - interval: 10s - timeout: 5s - retries: 5 - - redis: - image: redis:7-alpine - container_name: rfiles-redis - command: redis-server --requirepass ${REDIS_PASSWORD:-rfiles_redis_dev} - ports: - - "6380:6379" - healthcheck: - test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD:-rfiles_redis_dev}", "ping"] - interval: 10s - timeout: 5s - retries: 5 - - backend: - build: . - container_name: rfiles-api - volumes: - - .:/app - - rfiles_media:/app/media - environment: - - DATABASE_URL=postgresql://rfiles:${DB_PASSWORD:-rfiles_dev_password}@postgres:5432/rfiles - - CELERY_BROKER_URL=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 - - CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 - - DJANGO_SETTINGS_MODULE=config.settings - - DEBUG=True - - ALLOWED_HOSTS=localhost,127.0.0.1,rfiles.online,.rfiles.online - - SHARE_BASE_URL=http://localhost:8000 - ports: - - "8000:8000" - depends_on: - postgres: - condition: service_healthy - redis: - condition: service_healthy - command: > - sh -c "python manage.py migrate --noinput && - python manage.py runserver 0.0.0.0:8000" - - celery-worker: - build: . - container_name: rfiles-celery-worker - volumes: - - .:/app - - rfiles_media:/app/media - environment: - - DATABASE_URL=postgresql://rfiles:${DB_PASSWORD:-rfiles_dev_password}@postgres:5432/rfiles - - CELERY_BROKER_URL=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 - - CELERY_RESULT_BACKEND=redis://:${REDIS_PASSWORD:-rfiles_redis_dev}@redis:6379/0 - - DJANGO_SETTINGS_MODULE=config.settings - depends_on: - postgres: - condition: service_healthy - redis: - condition: service_healthy - command: celery -A config worker --loglevel=info --concurrency=2 - -volumes: - rfiles_postgres_data: - rfiles_media: diff --git a/docker-compose.yml b/docker-compose.yml new file mode 120000 index 0000000..9453180 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1 @@ +docker-compose.prod.yml \ No newline at end of file diff --git a/portal/templates/portal/base.html b/portal/templates/portal/base.html index 8ca741a..dead2a8 100644 --- a/portal/templates/portal/base.html +++ b/portal/templates/portal/base.html @@ -126,6 +126,7 @@ .mb-2 { margin-bottom: 1rem; } {% block extra_css %}{% endblock %} +
diff --git a/portal/templates/portal/shared_space/base.html b/portal/templates/portal/shared_space/base.html index 5faf136..d6456bb 100644 --- a/portal/templates/portal/shared_space/base.html +++ b/portal/templates/portal/shared_space/base.html @@ -145,6 +145,7 @@ .mb-2 { margin-bottom: 1rem; } {% block extra_css %}{% endblock %} +