Ver a proveniência

use matrix_nginx_proxy_data_path in matrix_nginx_proxy_synapse_cache_path

pull/1759/head
boris runakov há 4 anos
ascendente
cometimento
07cc457233
2 ficheiros alterados com 2 adições e 6 eliminações
  1. +1
    -1
      roles/matrix-nginx-proxy/defaults/main.yml
  2. +1
    -5
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2

+ 1
- 1
roles/matrix-nginx-proxy/defaults/main.yml Ver ficheiro

@@ -559,7 +559,7 @@ matrix_nginx_proxy_synapse_frontend_proxy_locations: []


# synapse content caching # synapse content caching
matrix_nginx_proxy_synapse_cache_enabled: false matrix_nginx_proxy_synapse_cache_enabled: false
matrix_nginx_proxy_synapse_cache_path: "{{ matrix_nginx_proxy_base_path+'/cache' if matrix_nginx_proxy_synapse_cache_enabled else '/tmp/cache' }}"
matrix_nginx_proxy_synapse_cache_path: "{{ matrix_nginx_proxy_data_path+'/cache' if matrix_nginx_proxy_synapse_cache_enabled else '/tmp/cache' }}"
matrix_nginx_proxy_synapse_cache_keys_zone_name: "STATIC" matrix_nginx_proxy_synapse_cache_keys_zone_name: "STATIC"
matrix_nginx_proxy_synapse_cache_keys_zone_size: "10m" matrix_nginx_proxy_synapse_cache_keys_zone_size: "10m"
matrix_nginx_proxy_synapse_cache_inactive_time: "48h" matrix_nginx_proxy_synapse_cache_inactive_time: "48h"


+ 1
- 5
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 Ver ficheiro

@@ -6,11 +6,7 @@
{% set frontend_proxy_workers = matrix_nginx_proxy_synapse_workers_list|selectattr('type', 'equalto', 'frontend_proxy')|list %} {% set frontend_proxy_workers = matrix_nginx_proxy_synapse_workers_list|selectattr('type', 'equalto', 'frontend_proxy')|list %}
{% if matrix_nginx_proxy_synapse_workers_enabled %} {% if matrix_nginx_proxy_synapse_workers_enabled %}
{% if matrix_nginx_proxy_synapse_cache_enabled %} {% if matrix_nginx_proxy_synapse_cache_enabled %}
proxy_cache_path {{ matrix_nginx_proxy_synapse_cache_path }} \
levels=1:2 \
keys_zone={{ matrix_nginx_proxy_synapse_cache_keys_zone_name }}:{{ matrix_nginx_proxy_synapse_cache_keys_zone_size }} \
inactive={{ matrix_nginx_proxy_synapse_cache_inactive_time }} \
max_size={{ matrix_nginx_proxy_synapse_cache_max_size }}m;
proxy_cache_path {{ matrix_nginx_proxy_synapse_cache_path }} levels=1:2 keys_zone={{ matrix_nginx_proxy_synapse_cache_keys_zone_name }}:{{ matrix_nginx_proxy_synapse_cache_keys_zone_size }} inactive={{ matrix_nginx_proxy_synapse_cache_inactive_time }} max_size={{ matrix_nginx_proxy_synapse_cache_max_size }}m;
{% endif %} {% endif %}
# Round Robin "upstream" pools for workers # Round Robin "upstream" pools for workers




Carregando…
Cancelar
Guardar