diff --git a/pretalx-docker/init.sls b/pretalx-docker/init.sls index 9bcb755..9906ceb 100644 --- a/pretalx-docker/init.sls +++ b/pretalx-docker/init.sls @@ -1,6 +1,11 @@ pretalx-data-directory-exists: file.directory: - - name: /opt/pretalx + - name: /opt/pretalx/data + - makedirs: True + +pretalx-public-directory-exists: + file.directory: + - name: /opt/pretalx/public - makedirs: True pretalx-config-file-is-present: @@ -12,7 +17,7 @@ pretalx-config-file-is-present: pretalx-docker-container-running: docker_container.running: - name: pretalx - - image: {{ salt['pillar.get']('forgejo:image:path', 'docker.io/pretalx/standalone:latest') }}:{{ salt['pillar.get']('forgejo:image:version', 'v2024.1.0') }} + - image: {{ salt['pillar.get']('pretalx:image:path', 'docker.io/pretalx/standalone:latest') }}:{{ salt['pillar.get']('pretalx:image:version', 'v2024.1.0') }} - container_name: pretalx - environment: - PRETALX_FILESYSTEM_MEDIA=/public/media @@ -22,7 +27,7 @@ pretalx-docker-container-running: - bridge - binds: - /opt/pretalx/pretalx.cfg:/etc/pretalx/pretalx.cfg:ro - - pretalx-data:/data - - pretalx-public:/public + - /opt/pretalx/data:/data + - /opt/pretalx/public:/public - port_bindings: - - "{{ salt['pillar.get']('forgejo:container_web_port', "127.0.0.1:3000") }}:80" + - "{{ salt['pillar.get']('pretalx:container_web_port', "127.0.0.1:3000") }}:80" diff --git a/pretalx-docker/pretalx.cfg.jinja b/pretalx-docker/pretalx.cfg.jinja index 1fb167f..656a97f 100644 --- a/pretalx-docker/pretalx.cfg.jinja +++ b/pretalx-docker/pretalx.cfg.jinja @@ -1,18 +1,14 @@ -[filesystem] -data = {{ salt['pillar.get']('pretalx:filesystem:data', '/var/pretalx/data') }} -static = {{ salt['pillar.get']('pretalx:filesystem:static', '/var/pretalx/static') }} - [site] debug = {{ salt['pillar.get']('pretalx:site:debug', 'False') }} url = {{ salt['pillar.get']('pretalx:site:url', 'https://pretalx.mydomain.com') }} [database] -backend = {{ salt['pillar.get']('pretalx:database:backend', 'postgresql') }} -name = {{ salt['pillar.get']('pretalx:database:name', 'pretalx') }} -user = {{ salt['pillar.get']('pretalx:database:user', 'False') }} -password = {{ salt['pillar.get']('pretalx:database:password', 'ChangeMe') }} -host = {{ salt['pillar.get']('pretalx:database:host', 'localhost') }} -port = {{ salt['pillar.get']('pretalx:database:port', '5432') }} +backend = {{ salt['pillar.get']('pretalx:database:backend', 'sqlite') }} +name = {{ salt['pillar.get']('pretalx:database:name', '') }} +user = {{ salt['pillar.get']('pretalx:database:user', '') }} +password = {{ salt['pillar.get']('pretalx:database:password', '') }} +host = {{ salt['pillar.get']('pretalx:database:host', '') }} +port = {{ salt['pillar.get']('pretalx:database:port', '') }} [mail] from = {{ salt['pillar.get']('pretalx:mail:from', 'admin@localhost') }}