diff --git a/inventories/chaosknoten/host_vars/hackertours.yaml b/inventories/chaosknoten/host_vars/hackertours.yaml index b7d24e0..6b6a0e5 100644 --- a/inventories/chaosknoten/host_vars/hackertours.yaml +++ b/inventories/chaosknoten/host_vars/hackertours.yaml @@ -1,5 +1,7 @@ docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/hackertours/compose.yaml.j2') }}" -docker_compose__configuration_files: [] +docker_compose__configuration_files: + - name: pretix.cfg + content: "{{ lookup('ansible.builtin.template', 'templates/chaosknoten/configs/hackertours/pretix.cfg.j2') }}" certbot__version_spec: "" certbot__acme_account_email_address: le-admin@hamburg.ccc.de diff --git a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 index 4dad604..e9f054f 100644 --- a/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 +++ b/playbooks/templates/chaosknoten/configs/hackertours/compose.yaml.j2 @@ -27,24 +27,12 @@ services: backend: pretix: - image: gitlab-cr.hamburg.ccc.de/ccchh/ccchh-pretix/ccchh-pretix:23.10.0 + image: docker.io/pretix/standalone:2023.10.0 command: ["all"] ports: - "8345:80" - environment: - - "PRETIX_INSTANCE_NAME=CCCHH Hackertours" - - "PRETIX_URL=https://hackertours.hamburg.ccc.de" - - "DATABASE_BACKEND=postgresql" - - "DATABASE_NAME=pretix" - - "DATABASE_USER=pretix" - - "DATABASE_PASSWORD={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }}" - - "DATABASE_HOST=database" - - "MAIL_FROM=ticket@hackertours.hamburg.ccc.de" - - "MAIL_HOST=cow-intern.hamburg.ccc.de" - - "REDIS_LOCATION=redis://redis/0" - - "CELERY_BACKEND=redis://redis/0" - - "CELERY_BROKER=redis://redis/1" volumes: + - ./configs/pretix.cfg:/etc/pretix/pretix.cfg - pretix:/data restart: always networks: diff --git a/playbooks/templates/chaosknoten/configs/hackertours/pretix.cfg.j2 b/playbooks/templates/chaosknoten/configs/hackertours/pretix.cfg.j2 new file mode 100644 index 0000000..a585cb9 --- /dev/null +++ b/playbooks/templates/chaosknoten/configs/hackertours/pretix.cfg.j2 @@ -0,0 +1,26 @@ +[pretix] +instance_name=CCCHH Hackertours +url=https://hackertours.hamburg.ccc.de +currency=EUR +datadir=/data +trust_x_forwarded_for=on +trust_x_forwarded_proto=on + +[database] +backend=postgresql +name=pretix +user=pretix +password={{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/hackertours/DB_PASSWORD", create=false, missing="error") }} +host=database + +[mail] +from=ticket@hackertours.hamburg.ccc.de +host=cow-intern.hamburg.ccc.de + +[redis] +location=redis://redis/0 +sessions=true + +[celery] +backend=redis://redis/0 +broker=redis://redis/1