[DEPLOY] Update deployment files for new database

This commit is contained in:
2023-02-24 19:45:56 +00:00
parent 83765c99ad
commit b6a6be99da
3 changed files with 25 additions and 7 deletions

View File

@@ -2,6 +2,10 @@
# Used to generate CSRF tokens - must never be made public # Used to generate CSRF tokens - must never be made public
SECRET_KEY=changeme SECRET_KEY=changeme
# REQUIRED=Database password
# The password for the breccia-mapper user in the postgres database
DB_PASSWORD=changeme
# Debug # Debug
# Should the server run in debug mode? Provides information to users which is unsafe in production # Should the server run in debug mode? Provides information to users which is unsafe in production
# Default: False # Default: False

View File

@@ -71,11 +71,6 @@
dest: '{{ project_dir }}/icon-192x192.png' dest: '{{ project_dir }}/icon-192x192.png'
mode: 0600 mode: 0600
- name: Create database file
ansible.builtin.file:
path: "{{ project_dir }}/db.sqlite3"
state: touch
- name: Start Docker - name: Start Docker
ansible.builtin.systemd: ansible.builtin.systemd:
name: docker name: docker
@@ -89,6 +84,7 @@
loop: loop:
- caddy - caddy
- server - server
- db
- name: Start containers - name: Start containers
ansible.builtin.command: ansible.builtin.command:

View File

@@ -11,9 +11,11 @@ services:
env_file: env_file:
- .env - .env
volumes: volumes:
- {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static - static_files:/app/static
- media_files:/app/media - media_files:/app/media
depends_on:
db:
condition: service_healthy
caddy: caddy:
image: caddy:2 image: caddy:2
@@ -25,15 +27,31 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile:z - ./Caddyfile:/etc/caddy/Caddyfile:z
# Caddy serves static files collected by Django # Caddy serves static files collected by Django
- static_files:/srv/static:ro - static_files:/srv/static:ro
- media_files:/srv/media:ro - media_files:/srv/media
- {{ project_dir }}/icon-192x192.png:/srv/media/icon-192x192.png:ro - {{ project_dir }}/icon-192x192.png:/srv/media/icon-192x192.png:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
depends_on: depends_on:
- server - server
db:
image: postgres:15.2-alpine
restart: unless-stopped
environment:
POSTGRES_DB: 'breccia-mapper'
POSTGRES_USER: 'breccia-mapper'
POSTGRES_PASSWORD: ${DB_PASSWORD}
volumes:
- postgres_data:/var/lib/postgresql/data/
healthcheck:
test: ["CMD-SHELL", "pg_isready -U breccia-mapper"]
interval: 5s
timeout: 5s
retries: 5
volumes: volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:
static_files: static_files:
media_files: media_files:
postgres_data: