Merge branch 'master' of https://gitea.rknet.org/ansible/xoxys.matrix
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Robert Kaussow 2019-01-24 13:29:00 +01:00
commit b3f92a668c
4 changed files with 16 additions and 9 deletions

View File

@ -28,7 +28,7 @@ steps:
settings:
homeserver: https://matrix.rknet.org
roomid: MtidqQXWWAtQcByBhH:rknet.org
template: "Status: [**_{{ build.status }}_**]({{ build.link }})<br/> Build: {{ repo.Owner }}/{{ repo.Name }}#{{ truncate build.commit 8 }} ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
username:
from_secret: matrix_username
password:

View File

@ -40,6 +40,13 @@ matrix_conf_dir: "{{ matrix_base_dir }}/config"
matrix_data_dir: "{{ matrix_base_dir }}/data"
matrix_log_dir: "{{ matrix_base_dir }}/logs"
matrix_log_file_level: INFO
matrix_log_console_level: ERROR
matrix_log_synapse_level: INFO
matrix_log_synapse_sql_level: INFO
matrix_log_ldap_level: INFO
matrix_log_ldap_auth_level: INFO
matrix_server_url: example.com
matrix_client_url: https://matrix.example.com

View File

@ -122,7 +122,7 @@ listeners:
# Main HTTPS listener
- port: {{ matrix_https_bind_port }}
bind_addresses:
{{ matrix_https_bind_ips | to_nice_yaml(indent=2) }}
{{ matrix_https_bind_ips | to_nice_yaml(indent=2) | indent(4) }}
type: http
tls: true
x_forwarded: false
@ -154,7 +154,7 @@ listeners:
- port: {{ matrix_http_bind_port }}
tls: false
bind_addresses:
{{ matrix_https_bind_ips | to_nice_yaml(indent=2) }}
{{ matrix_http_bind_ips | to_nice_yaml(indent=2) | indent(4) }}
type: http
x_forwarded: false

View File

@ -20,29 +20,29 @@ handlers:
backupCount: 10
filters: [context]
encoding: utf8
level: DEBUG
level: {{ matrix_log_file_level }}
console:
class: logging.StreamHandler
formatter: precise
filters: [context]
level: {{ matrix_log_console_level }}
loggers:
synapse:
level: INFO
level: {{ matrix_log_synapse_level }}
synapse.storage.SQL:
# beware: increasing this to DEBUG will make synapse log sensitive
# information such as access tokens.
level: INFO
level: {{ matrix_log_synapse_sql_level }}
{% if matrix_ldap_auth_enabled %}
ldap3:
level: DEBUG
level: {{ matrix_log_ldap_level }}
ldap_auth_provider:
level: DEBUG
level: {{ matrix_log_ldap_auth_level }}
{% endif %}
root:
level: INFO
handlers: [file, console]