add logrotate config; switch to new loop syntax
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
f84f00edf0
commit
1889eedd0e
|
@ -38,7 +38,7 @@ matrix_lvm_enabled: False
|
||||||
matrix_base_dir: "/opt/matrix"
|
matrix_base_dir: "/opt/matrix"
|
||||||
matrix_conf_dir: "{{ matrix_base_dir }}/config"
|
matrix_conf_dir: "{{ matrix_base_dir }}/config"
|
||||||
matrix_data_dir: "{{ matrix_base_dir }}/data"
|
matrix_data_dir: "{{ matrix_base_dir }}/data"
|
||||||
matrix_log_dir: "{{ matrix_base_dir }}/logs"
|
matrix_log_dir: "{{ matrix_base_dir }}/log"
|
||||||
|
|
||||||
matrix_log_file_level: INFO
|
matrix_log_file_level: INFO
|
||||||
matrix_log_console_level: ERROR
|
matrix_log_console_level: ERROR
|
||||||
|
@ -47,6 +47,16 @@ matrix_log_synapse_sql_level: INFO
|
||||||
matrix_log_ldap_level: INFO
|
matrix_log_ldap_level: INFO
|
||||||
matrix_log_ldap_auth_level: INFO
|
matrix_log_ldap_auth_level: INFO
|
||||||
|
|
||||||
|
matrix_logrotate_enabled: False
|
||||||
|
matrix_logrotate_config:
|
||||||
|
- log: "{{ matrix_log_dir }}/homeserver.log"
|
||||||
|
options:
|
||||||
|
- weekly
|
||||||
|
- rotate 4
|
||||||
|
- maxsize 250K
|
||||||
|
- compress
|
||||||
|
- shred
|
||||||
|
|
||||||
matrix_server_url: example.com
|
matrix_server_url: example.com
|
||||||
matrix_client_url: https://matrix.example.com
|
matrix_client_url: https://matrix.example.com
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,13 @@
|
||||||
dest: "/etc/systemd/system/matrix.service"
|
dest: "/etc/systemd/system/matrix.service"
|
||||||
notify: __matrix_restart
|
notify: __matrix_restart
|
||||||
|
|
||||||
|
- name: Copy logrotate config
|
||||||
|
template:
|
||||||
|
src: "etc/logrotate.d/config.j2"
|
||||||
|
dest: "/etc/logrotate.d/matrix"
|
||||||
|
loop: "{{ matrix_logrotate_config }}"
|
||||||
|
when: matrix_logrotate_enabled
|
||||||
|
|
||||||
- name: Open ports in iptables
|
- name: Open ports in iptables
|
||||||
iptables_raw:
|
iptables_raw:
|
||||||
name: "{{ item.name }}"
|
name: "{{ item.name }}"
|
||||||
|
@ -72,7 +79,7 @@
|
||||||
state: "{{ item.state }}"
|
state: "{{ item.state }}"
|
||||||
weight: "{{ item.weight | default(omit) }}"
|
weight: "{{ item.weight | default(omit) }}"
|
||||||
table: "{{ item.table | default(omit) }}"
|
table: "{{ item.table | default(omit) }}"
|
||||||
with_items: "{{ matrix_open_ports }}"
|
loop: "{{ matrix_open_ports }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.name }}"
|
label: "{{ item.name }}"
|
||||||
when: matrix_iptables_enabled
|
when: matrix_iptables_enabled
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
src: "{{ item.src }}"
|
src: "{{ item.src }}"
|
||||||
dest: "{{ item.dest }}"
|
dest: "{{ item.dest }}"
|
||||||
mode: "{{ item.mode }}"
|
mode: "{{ item.mode }}"
|
||||||
with_items:
|
loop:
|
||||||
- { src: "{{ matrix_tls_key_source }}", dest: '/etc/pki/tls/private/{{ matrix_nginx_tls_key_file }}', mode: '0600' }
|
- { src: "{{ matrix_tls_key_source }}", dest: '/etc/pki/tls/private/{{ matrix_nginx_tls_key_file }}', mode: '0600' }
|
||||||
- { src: "{{ matrix_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ matrix_nginx_tls_cert_file }}', mode: '0750' }
|
- { src: "{{ matrix_tls_cert_source }}", dest: '/etc/pki/tls/certs/{{ matrix_nginx_tls_cert_file }}', mode: '0750' }
|
||||||
loop_control:
|
loop_control:
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
owner: "{{ matrix_user }}"
|
owner: "{{ matrix_user }}"
|
||||||
group: "{{ matrix_group }}"
|
group: "{{ matrix_group }}"
|
||||||
recurse: True
|
recurse: True
|
||||||
with_items:
|
loop:
|
||||||
- "{{ matrix_tls_dhparam_path | dirname }}"
|
- "{{ matrix_tls_dhparam_path | dirname }}"
|
||||||
- "{{ matrix_tls_cert_path | dirname }}"
|
- "{{ matrix_tls_cert_path | dirname }}"
|
||||||
- "{{ matrix_tls_key_path | dirname }}"
|
- "{{ matrix_tls_key_path | dirname }}"
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
src: "{{ item.src }}"
|
src: "{{ item.src }}"
|
||||||
dest: "{{ item.dest }}"
|
dest: "{{ item.dest }}"
|
||||||
mode: "{{ item.mode }}"
|
mode: "{{ item.mode }}"
|
||||||
with_items:
|
loop:
|
||||||
- { src: "{{ matrix_tls_key_source }}", dest: '{{ matrix_tls_key_path }}', mode: '0600' }
|
- { src: "{{ matrix_tls_key_source }}", dest: '{{ matrix_tls_key_path }}', mode: '0600' }
|
||||||
- { src: "{{ matrix_tls_cert_source }}", dest: '{{ matrix_tls_cert_path }}', mode: '0650' }
|
- { src: "{{ matrix_tls_cert_source }}", dest: '{{ matrix_tls_cert_path }}', mode: '0650' }
|
||||||
loop_control:
|
loop_control:
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#jinja2: lstrip_blocks: True
|
||||||
|
# {{ ansible_managed }}
|
||||||
|
{{ item.log }} {
|
||||||
|
{% for option in item.options %}
|
||||||
|
{{ option }}
|
||||||
|
{% endfor %}
|
||||||
|
postrotate
|
||||||
|
/usr/bin/pkill -HUP rsyslogd
|
||||||
|
endscript
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
#jinja2: lstrip_blocks: True
|
#jinja2: lstrip_blocks: True
|
||||||
## {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Synapse Matrix homeserver
|
Description=Synapse Matrix homeserver
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue