diff --git a/roles/web-app-pretix/config/main.yml b/roles/web-app-pretix/config/main.yml index 4cfc38aa..f6a59227 100644 --- a/roles/web-app-pretix/config/main.yml +++ b/roles/web-app-pretix/config/main.yml @@ -9,8 +9,11 @@ docker: image: pretix/standalone version: stable name: pretix + backup: + no_stop_required: true volumes: data: "pretix_data" + config: "pretix_config" features: matomo: true css: true diff --git a/roles/web-app-pretix/templates/docker-compose.yml.j2 b/roles/web-app-pretix/templates/docker-compose.yml.j2 index 97d247d6..0136b770 100644 --- a/roles/web-app-pretix/templates/docker-compose.yml.j2 +++ b/roles/web-app-pretix/templates/docker-compose.yml.j2 @@ -11,6 +11,7 @@ - "127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}" volumes: - 'data:/data' + - 'config:/etc/pretix' {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} {% include 'roles/docker-container/templates/base.yml.j2' %} {% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %} @@ -19,5 +20,7 @@ {% include 'roles/docker-compose/templates/volumes.yml.j2' %} data: name: {{ PRETIX_DATA_VOLUME }} + config: + name: {{ PRETIX_CONFIG_VOLUME }} {% include 'roles/docker-compose/templates/networks.yml.j2' %} diff --git a/roles/web-app-pretix/vars/main.yml b/roles/web-app-pretix/vars/main.yml index ae12c1e2..a7d83522 100644 --- a/roles/web-app-pretix/vars/main.yml +++ b/roles/web-app-pretix/vars/main.yml @@ -5,6 +5,7 @@ container_port: 80 container_hostname: "{{ domains | get_domain(application_id) }}" # Pretix + ## URLs PRETIX_URL: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}" PRETIX_HOSTNAME: "{{ container_hostname }}" @@ -23,6 +24,7 @@ PRETIX_OIDC_JWKS_URL: "{{ OIDC.CLIENT.CERTS }}" PRETIX_OIDC_SCOPES: "openid,email,profile" # Use Keycloak username claim by default (plugin default is 'sub') PRETIX_OIDC_UNIQUE_ATTRIBUTE: "{{ OIDC.ATTRIBUTES.USERNAME }}" +PRETIX_OIDC_PLUGIN_VERSION: "{{ applications | get_app_conf(application_id, 'plugins.oidc.version') }}" ## Redis PRETIX_REDIS_ENABLED: "{{ applications | get_app_conf(application_id, 'docker.services.redis.enabled') }}" @@ -36,4 +38,4 @@ PRETIX_IMAGE: "{{ applications | get_app_conf(application_id, PRETIX_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.pretix.version') }}" PRETIX_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.pretix.name') }}" PRETIX_DATA_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.data') }}" -PRETIX_OIDC_PLUGIN_VERSION: "{{ applications | get_app_conf(application_id, 'plugins.oidc.version') }}" +PRETIX_CONFIG_VOLUME: "{{ applications | get_app_conf(application_id, 'docker.volumes.config') }}"