summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/sk-cloudio/onlyoffice.yml4
-rw-r--r--inventory/host_vars/sk-tomnext-nc.yml4
-rw-r--r--roles/apps/onlyoffice/templates/pod-spec.yml.j24
3 files changed, 6 insertions, 6 deletions
diff --git a/inventory/host_vars/sk-cloudio/onlyoffice.yml b/inventory/host_vars/sk-cloudio/onlyoffice.yml
index ce6a128b..026d11ba 100644
--- a/inventory/host_vars/sk-cloudio/onlyoffice.yml
+++ b/inventory/host_vars/sk-cloudio/onlyoffice.yml
@@ -8,7 +8,7 @@ onlyoffice_zfs:
onlyoffice_instances:
office.elev8.at:
- version: 6.4.2.6
+ version: 7.5.1.1
port: 8600
hostname: office.elev8.at
jwt_secret: "{{ vault_onlyoffice_jwt_secrets['office.elev8.at'] }}"
@@ -16,5 +16,5 @@ onlyoffice_instances:
version: 9.5.25
password: "{{ vault_onlyoffice_database_passwords['office.elev8.at'] }}"
amqp:
- version: 3.9.11
+ version: 3.11.28
password: "{{ vault_onlyoffice_amqp_passwords['office.elev8.at'] }}"
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index c2f6b315..2eb90074 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -178,7 +178,7 @@ onlyoffice_zfs:
onlyoffice_instances:
oo.tomwaitz.eu:
- version: 6.4.2.6
+ version: 7.5.1.1
port: 8600
hostname: oo.tomwaitz.eu
jwt_secret: "{{ vault_onlyoffice_jwt_secrets['oo.tomwaitz.eu'] }}"
@@ -186,5 +186,5 @@ onlyoffice_instances:
version: 9.5.25
password: "{{ vault_onlyoffice_database_passwords['oo.tomwaitz.eu'] }}"
amqp:
- version: 3.9.11
+ version: 3.11.28
password: "{{ vault_onlyoffice_amqp_passwords['oo.tomwaitz.eu'] }}"
diff --git a/roles/apps/onlyoffice/templates/pod-spec.yml.j2 b/roles/apps/onlyoffice/templates/pod-spec.yml.j2
index 74fb1ab6..58efcb00 100644
--- a/roles/apps/onlyoffice/templates/pod-spec.yml.j2
+++ b/roles/apps/onlyoffice/templates/pod-spec.yml.j2
@@ -33,12 +33,12 @@ containers:
value: "rabbitmq"
- name: "AMQP_URI"
value: "amqp://onlyoffice:{{ item.value.amqp.password }}@127.0.0.1:5672"
-{% if 'jwt_secret' in item.value %}
- name: "JWT_ENABLED"
value: "true"
- name: "JWT_SECRET"
value: "{{ item.value.jwt_secret }}"
-{% endif %}
+ - name: "JWT_HEADER"
+ value: "AuthorizationJwt"
ports:
- containerPort: 80
hostPort: {{ item.value.port }}