From 7533271edb41a60a29663fe8c0ec62b5764c7c10 Mon Sep 17 00:00:00 2001 From: Tyler Hale Date: Tue, 6 Jun 2023 06:18:15 -0600 Subject: [PATCH] Updates for v6 --- roles/zammad/tasks/main.yml | 9 ++++++++- roles/zammad/templates/zammad.conf.j2 | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/roles/zammad/tasks/main.yml b/roles/zammad/tasks/main.yml index 65d54fd..5a64faa 100644 --- a/roles/zammad/tasks/main.yml +++ b/roles/zammad/tasks/main.yml @@ -82,9 +82,16 @@ - elasticsearch - nginx - postgresql-server - - compat-openssl11 + - compat-openssl11 + - redis state: present +- name: Start and enable redis services + service: + name: redis + state: started + enabled: yes + - name: Check if postgresql is initialized stat: path: "/var/lib/pgsql/data/pg_hba.conf" diff --git a/roles/zammad/templates/zammad.conf.j2 b/roles/zammad/templates/zammad.conf.j2 index 0c0be26..774f344 100644 --- a/roles/zammad/templates/zammad.conf.j2 +++ b/roles/zammad/templates/zammad.conf.j2 @@ -53,6 +53,18 @@ server { proxy_pass http://zammad-websocket; } + # action cable + location /cable { + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header CLIENT_IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 86400; + proxy_pass http://zammad-railsserver; + } + location / { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr;