Просмотр исходного кода

Add support for configuring max_upload_size

pull/6/head
Slavi Pantaleev 8 лет назад
Родитель
Сommit
2bb8bb96d4
3 измененных файлов: 10 добавлений и 4 удалений
  1. +3
    -1
      roles/matrix-server/defaults/main.yml
  2. +6
    -0
      roles/matrix-server/tasks/setup_synapse.yml
  3. +1
    -3
      roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2

+ 3
- 1
roles/matrix-server/defaults/main.yml Просмотреть файл

@@ -44,4 +44,6 @@ matrix_services_restart_cron_time_definition: "15 4 3 * *"
matrix_coturn_turn_udp_min_port: 49152
matrix_coturn_turn_udp_max_port: 49172

matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"

matrix_max_upload_size_mb: 10

+ 6
- 0
roles/matrix-server/tasks/setup_synapse.yml Просмотреть файл

@@ -101,6 +101,12 @@
- {'variable': 'max-port', 'value': "{{ matrix_coturn_turn_udp_max_port }}"}
- {'variable': 'external-ip', 'value': "{{ matrix_coturn_turn_external_ip_address }}"}

- name: Augment Matrix config (set max upload size)
lineinfile: "dest={{ matrix_synapse_data_path }}/homeserver.yaml"
args:
regexp: "^max_upload_size:"
line: 'max_upload_size: "{{ matrix_max_upload_size_mb }}M"'

- name: Allow access to Matrix ports in firewalld
firewalld:
port: "{{ item }}"


+ 1
- 3
roles/matrix-server/templates/nginx-conf.d/matrix-synapse.conf.j2 Просмотреть файл

@@ -34,10 +34,8 @@ server {
proxy_pass http://synapse:8008;
proxy_set_header X-Forwarded-For $remote_addr;

# These are intentionally large.
# Note that Synapse enforces its own limits, which are smaller.
client_body_buffer_size 25M;
client_max_body_size 100M;
client_max_body_size {{ matrix_max_upload_size_mb }}M;
proxy_max_temp_file_size 0;
}
}

Загрузка…
Отмена
Сохранить