diff --git a/inventories/chaosknoten/host_vars/hta.sops.yaml b/inventories/chaosknoten/host_vars/hta.sops.yaml index 90771072..5b3f0c34 100644 --- a/inventories/chaosknoten/host_vars/hta.sops.yaml +++ b/inventories/chaosknoten/host_vars/hta.sops.yaml @@ -1,10 +1,11 @@ secret__hta_db_password: ENC[AES256_GCM,data:b8YhuqgD9n/xwNGin1GSllix72hZSD6wgtH5rfp3/JVMudKNFvUdO6MIGiqURbvm,iv:ZN3mrmpdOvzDeKuT5HsKHR5V7rx0qLsHZJix96Q7GR8=,tag:RPSUa9J4RkBWq2fetCF6kg==,type:str] +secret__hta_fasta_api_key: ENC[AES256_GCM,data:bcPBrOQhgv+EcKPl/Ucbr7pbaNh3OXHtK35rEZq5bcE=,iv:vcrzlYiqcmejqAlSVNOwbQNsQzU9zlyvqCV652d9R9o=,tag:xI98Mx6sv9O+SDUSNYReEQ==,type:str] secret__hta_django_secret_key: ENC[AES256_GCM,data:28Ar6YoZJXKquJddswdsJi/FVTe0T8QhpZOsG/fsWtjDakznRX+ny42xCFaRSL7zHEpcWYZJEgDD7tdN6cMIcNKLqRpsNQFdxwjJNRPmRO9UVWCxv+Y7Of+G9TvUI8Hz,iv:/vkcahvd9yglcV4rU0r1VWNtS1cdtXaIY2MlkQxdMTw=,tag:m+o/DrNHdYdWS3AQBImGzg==,type:str] secret__hta_hugo_repo_ssh_key: ENC[AES256_GCM,data:B09k96c8MQtpFd6Lb1BAOErSYgqmVBPpUL1IdfbM9hcBDMyxzNOWi+PGyQ3E8cfEt0EHtUQpoVd9/2wJ1ckzit1NTfUjKjssAaWXE7XW4EpKBRtX3C2OQik9JkYLNsAJ8CRBft/nb6XUYpbL5Hz5iVFe643wS6w3r2QRLv8Tjh6WwcUxAA8RZYyOzCKGuCZiE7KZ0eQ+B5XttRisy13klDwclFy/y9+rgqA1xs0k6xfsNF13JwL/FX4Gtr2BcVPc/ROO9kIl+hLzV2FEaAqyc5abiIoqZsE83fPBusRUCQgGDe/BSPq67kGLdaCCbJtAk9EUpKjiZ0I3IO3K+fWHXmNfWWygA/BqDQzfUIUQ9nip+3W+MrJjk3ZzcJhTxwc1zak7U1ikzMxnbEAK8bbhEdLyK9NMCbwhn8TBgpBsMm6WLqU3p32Yo2FdIjy4BWNRi1KybSjcxvB6vtNn4DsMAtoxPY9fmonbpE9ajMJxTeFjUpixPwKMF9mb+jE32DmR6EPIBAyIhjvvXYs7awsfBrqm7ArxJBXNDhyw7p78fjxhjgO8NdEt7Q==,iv:L1/Hv3S6bieMjCizQ4FePOUD0awu93fO6wzm9F2rv88=,tag:1fxJf/QeJzBiRds5vgEoog==,type:str] -secret__hta_pretix_token: ENC[AES256_GCM,data:Ll6X+NgygZYNY+zlLaGahkSitQtDDG/YHgDLU1nvR+ag9oecbXdOL0oL/gt8MRx5+ppAhggTfk3t3E1qS15kxQ==,iv:Hb7fPaYI5wHLvkw6EUfW/4ou8Ma7JZet69QtiAx+DDw=,tag:Zca/6ITY6FmPXGXNQVYXfw==,type:str] -secret__hta_db_fasta_api_key: ENC[AES256_GCM,data:4XFSEJgPu/VRFEgADReKxAtiIFoZTm/1DiyPhyQdb2g=,iv:NE1Pu06zvaFmpCReI6Euwl2rHPzk10WYznKFKrJ99bo=,tag:4BL3Fchew6V7W0mcR4s6+g==,type:str] secret__hta_geofox_secret: ENC[AES256_GCM,data:J0O/+DcoI7g9Usb3,iv:77o/A9w42hfwSGbi32whN8QyxKz8QnIzE1RyZ9LM0Pg=,tag:tRI+aVWAvgNXRk8eYf91Gg==,type:str] +secret__hta_mastodon_token: ENC[AES256_GCM,data:kfyHlrtXZrlPN/XjIsrlQ2Yv1gJQyUmsQXu+blqFTWlcTLFTImp3efL25A==,iv:n67kwG7aAYEzqiDIfZgq6g+1u4m6c354odACmp/D7HE=,tag:Q7pADpBDWykvKTOEwIRHuA==,type:str] secret__hta_oidc_client_secret: ENC[AES256_GCM,data:l4RkqAqgDJKyxJul+q56/xT5ZlRHyBMaVtVIaXC8n/F746VQhm/F6Ry6YSIsazknP4dQmCaeMekj9c0vEsgG3OAy98KxpkzH6cLoS64U7ocseCq8H7s=,iv:g1o6Ip4ui4Q736r1NR31JBaoHGwWo/kTSeRhUVoMjfI=,tag:yzfAEgZ3kWJcPbWD0RvJ8w==,type:str] +secret__hta_pretix_token: ENC[AES256_GCM,data:Ll6X+NgygZYNY+zlLaGahkSitQtDDG/YHgDLU1nvR+ag9oecbXdOL0oL/gt8MRx5+ppAhggTfk3t3E1qS15kxQ==,iv:Hb7fPaYI5wHLvkw6EUfW/4ou8Ma7JZet69QtiAx+DDw=,tag:Zca/6ITY6FmPXGXNQVYXfw==,type:str] ansible_pull__age_private_key: ENC[AES256_GCM,data:fmm0tr2E3MYznW9vXc4TTn9fJxpyA/84DVZ+Q2hcMa0qp31P6bdIUN4DxExxE8s4/MduSYZmyjRwIUQgpSW3WjNkjMkLeX5RvDI=,iv:jZyNAxeY3WmsVRA3dUM4zlFGbnyaSJq+b7V5eILIfJg=,tag:BEfi42kTqvE87P6EvU3Hlg==,type:str] sops: age: @@ -37,8 +38,8 @@ sops: T3SKXvpquNxWimzZ43GnN77IlV+mw41ynHG/CQhRfvX84svuF++WYg== -----END AGE ENCRYPTED FILE----- recipient: age1n44q80zmsnq8dehnkm8g78u0ku48zafrq4vg5pzz8ft9jkqja5jsamwxhn - lastmodified: "2026-11-13T21:53:13Z" - mac: ENC[AES256_GCM,data:CagAooV6eCqydfUXNmsSKwno8cO4pDXUEGaFcqZAze+Ox2S1yw4P/JKhsflnVWRfCbh/c4IBsU5n/0gvqt0aiqFmae6MbCWyv5t25v38bqBEDGBaTpg7StGepDFJrPGc5+u0wIq6fSKzCFjIW/4j1Np2wR5Xt5PKhFTEnl6X/Zg=,iv:pXxcbFB8qLz7bUAhpNGjNOEaOioQYFzDhWiYrzGK0Cg=,tag:dGL6UFL4wI3/ijkqDt6uWQ==,type:str] + lastmodified: "2026-11-14T21:53:27Z" + mac: ENC[AES256_GCM,data:QGmbKpDqsCVpGVBo30BVkDi4mf43h5a+4KfXhKs3FWhIVBQS9bXrKqIWhkrRbVyWvZLiYU8+m5eaN3n2C6OgvnRXZMDulFiA7ciu4sjUBVatwzeINGJBUKzk4BcQ9+cV8pBME5DFJsVnuQNdlEeJDoCtwPhk3sgnGQeWIYAuU8M=,iv:JmB5dQ43qy6sgaq89B+v/ViXtidbQ8qsFcUY5WmPmTk=,tag:OZrcWsaQZcL0ppaTXtG45Q==,type:str] pgp: - created_at: "2026-11-01T18:44:12Z" enc: |- diff --git a/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 b/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 index c0be9b2d..733f9000 100644 --- a/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/hta/docker_compose/compose.yaml.j2 @@ -1,6 +1,22 @@ --- # Hackertours Admin, see https://git.hamburg.ccc.de/CCCHH/hackertours-admin/src/branch/main/compose.yaml +x-shared-env: &shared-env + DATABASE_URL: {{ ('postgres://hackertours:' ~ secret__hta_db_password ~ '@database:5432/hackertours') | to_json }} + DJANGO_SECRET_KEY: {{ secret__hta_django_secret_key | to_json }} + GEOFOX_USERNAME: StefanBethke + GEOFOX_PASSWORD: {{ secret__hta_geofox_secret | to_json }} + GOTENBERG_URL: http://gotenberg:3000 + HUGO_BRANCH: main + HUGO_REPO_URL: ssh://forgejo@git.hamburg.ccc.de/CCCHH/hackertours.git + HUGO_REPO_SSH_KEY: {{ secret__hta_hugo_repo_ssh_key | to_json }} + HUGO_REPO_KNOWN_HOSTS: 'git.hamburg.ccc.de ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC91Cgx/Ow3oRm1GdB5mkGbUEIKsWfggsVrvHy2EwLfTKPeDdFDzEwQaN6gzUxiLHhk6zNK4ygCOhMjEQFPw2mRAgsSk0vRnGxnnd+AhPfCMK+nZ4mAJ2EIeGiOMpYoJ49XytL+H0hwJcFlawxzkuOMFve65mOmJnA5zhDX8EsBbi8ulnuOfiXV/iq8VSRWONNCX/rgUJDBcryGAii7LY4zfTg7taWFmBZpFq/qcMaqXLwp6L63c7POmjUsrN8WphRUTYNoeZh7gmUZNanqGpGotsKisU+sQThuMpMEm7imSAtqL1qYfjPTxjlcreL1asqfvjp5K1apt+NSQdEbeRbcAU1xLjKzW3pzYh1bWvC1FJfgFHptEfqgkK3ebCBoS9xVUXtnyvUbbi569QM1Qly+W5r6N8a4aZHnVD4RFAzHNNDFYaks1E6uKfdgLQcwzLhXcB+fRMy8+b4RLz46vS/dYcrxKVMLtBiVZis9pd4GZ4IVLUXu9Z3ixFPBdf/YtW/WrKJKyEydEh0nMP0o49sWTI25yhxKPL2JXLlaQozVD6sxUP1wDU2MW1OvNlf4JsomyYiQ9gjsacP63RL5G8193Hw4A+r77pILQbv3PzVze1wqU/fyOBt/IImxxQ6fOy1sjohRuaXAPn4NaFTbykecyvr4GUaFvK5evG8Ao5Ql3w==\ngit.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILrfbiDq3l25G7FUvbAGEdbBvIlbm+Od+P33OgIup2IR' + MASTODON_URL: https://chaos.social + MASTODON_TOKEN: {{ secret__hta_mastodon_token | to_json }} + MOTIS_URL: http://motis:8080 + PRETIX_URL: https://tickets.hamburg.ccc.de + PRETIX_TOKEN: {{ secret__hta_pretix_token | to_json }} + services: database: image: docker.io/library/postgres:18-alpine @@ -21,22 +37,11 @@ services: app: image: git.hamburg.ccc.de/ccchh/hackertours-admin:main environment: - DATABASE_URL: {{ ('postgres://hackertours:' ~ secret__hta_db_password ~ '@database:5432/hackertours') | to_json }} - GUNICORN_CMD_ARGS: "--timeout 60" - DJANGO_SECRET_KEY: {{ secret__hta_django_secret_key | to_json }} + <<: *shared-env DJANGO_ALLOWED_HOSTS: hta.hamburg.ccc.de DJANGO_CSRF_TRUSTED_ORIGINS: https://hta.hamburg.ccc.de DJANGO_BEHIND_PROXY: "1" - GEOFOX_USERNAME: StefanBethke - GEOFOX_PASSWORD: {{ secret__hta_geofox_secret | to_json }} - GOTENBERG_URL: http://gotenberg:3000 - MOTIS_URL: http://motis:8080 - HUGO_REPO_URL: ssh://forgejo@git.hamburg.ccc.de/CCCHH/hackertours.git - HUGO_REPO_SSH_KEY: {{ secret__hta_hugo_repo_ssh_key | to_json }} - # Output of `ssh-keyscan git.hamburg.ccc.de`, newlines written as \n - HUGO_REPO_KNOWN_HOSTS: 'git.hamburg.ccc.de ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC91Cgx/Ow3oRm1GdB5mkGbUEIKsWfggsVrvHy2EwLfTKPeDdFDzEwQaN6gzUxiLHhk6zNK4ygCOhMjEQFPw2mRAgsSk0vRnGxnnd+AhPfCMK+nZ4mAJ2EIeGiOMpYoJ49XytL+H0hwJcFlawxzkuOMFve65mOmJnA5zhDX8EsBbi8ulnuOfiXV/iq8VSRWONNCX/rgUJDBcryGAii7LY4zfTg7taWFmBZpFq/qcMaqXLwp6L63c7POmjUsrN8WphRUTYNoeZh7gmUZNanqGpGotsKisU+sQThuMpMEm7imSAtqL1qYfjPTxjlcreL1asqfvjp5K1apt+NSQdEbeRbcAU1xLjKzW3pzYh1bWvC1FJfgFHptEfqgkK3ebCBoS9xVUXtnyvUbbi569QM1Qly+W5r6N8a4aZHnVD4RFAzHNNDFYaks1E6uKfdgLQcwzLhXcB+fRMy8+b4RLz46vS/dYcrxKVMLtBiVZis9pd4GZ4IVLUXu9Z3ixFPBdf/YtW/WrKJKyEydEh0nMP0o49sWTI25yhxKPL2JXLlaQozVD6sxUP1wDU2MW1OvNlf4JsomyYiQ9gjsacP63RL5G8193Hw4A+r77pILQbv3PzVze1wqU/fyOBt/IImxxQ6fOy1sjohRuaXAPn4NaFTbykecyvr4GUaFvK5evG8Ao5Ql3w==\ngit.hamburg.ccc.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILrfbiDq3l25G7FUvbAGEdbBvIlbm+Od+P33OgIup2IR' - PRETIX_URL: https://tickets.hamburg.ccc.de - PRETIX_TOKEN: {{ secret__hta_pretix_token | to_json }} + GUNICORN_CMD_ARGS: "--timeout 60" OIDC_RP_CLIENT_ID: hta OIDC_RP_CLIENT_SECRET: {{ secret__hta_oidc_client_secret | to_json }} OIDC_OP_AUTHORIZATION_ENDPOINT: https://id.hamburg.ccc.de/realms/ccchh/protocol/openid-connect/auth @@ -59,6 +64,24 @@ services: frontend: restart: unless-stopped + worker: + image: git.hamburg.ccc.de/ccchh/hackertours-admin:main + restart: unless-stopped + environment: + <<: *shared-env + SKIP_MIGRATE: "1" + command: ["python", "manage.py", "run_worker"] + # A website sync can take a few minutes; the worker finishes its job before stopping. + stop_grace_period: 5m + depends_on: + app: + condition: service_healthy + volumes: + - data:/data + networks: + backend: + frontend: + # Renders the PDF handouts (HTML to PDF with Chromium); needs internet access for the map tiles. gotenberg: image: docker.io/gotenberg/gotenberg:8.38.1 @@ -76,7 +99,7 @@ services: MOTIS_REFRESH_HOURS: "24" # Lift status from DB FaSta DB_FASTA_CLIENT_ID: 9771ff8a0dd67637801e95fde5a5999f - DB_FASTA_API_KEY: {{ secret__hta_db_fasta_api_key | to_json }} + DB_FASTA_API_KEY: {{ secret__hta_fasta_api_key | to_json }} volumes: - motis:/data networks: