diff --git a/fluent-bit.yml b/fluent-bit.yml index 0cd3ec5..ba29bfb 100644 --- a/fluent-bit.yml +++ b/fluent-bit.yml @@ -4,3 +4,21 @@ roles: - role: fluent-bit tags: fluent-bit + tasks: + - block: + - name: ensure promtail service is not running + service: + name: promtail + state: stopped + ignore_errors: true + - name: ensure promtail service is not enabled + service: + name: promtail + enabled: false + ignore_errors: true + - name: ensure promtail is not installed + package: + name: promtail + state: absent + tags: + - remove-promtail diff --git a/hosts b/hosts index 4cc43a9..34138c5 100644 --- a/hosts +++ b/hosts @@ -183,7 +183,6 @@ pxe0.pyrocufflink.blue cloud0.pyrocufflink.blue db0.pyrocufflink.blue dc-grumbly.pyrocufflink.blue -dc-headphone.pyrocufflink.blue file0.pyrocufflink.blue git0.pyrocufflink.blue haproxy0.pyrocufflink.blue @@ -231,7 +230,6 @@ unifi [samba-dc] dc-grumbly.pyrocufflink.blue -dc-headphone.pyrocufflink.blue [serterm] chromie.pyrocufflink.blue diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml index 7c10ece..68af109 100644 --- a/roles/apache/defaults/main.yml +++ b/roles/apache/defaults/main.yml @@ -1,6 +1,6 @@ apache_mpm: event -apache_keep_num_logs: 4 -apache_max_log_size: 256M +apache_keep_num_logs: 2 +apache_max_log_size: 64M apache_error_log: syslog:daemon apache_ssl_protocol: - all diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index f3d7a73..877e982 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,8 +1,8 @@ -gitea_version: 1.20.5 +gitea_version: 1.24.7 gitea_arch: '{{ _gitea_arch_map[ansible_architecture] }}' gitea_bin: gitea-{{ gitea_version }}-linux-{{ gitea_arch }} gitea_bin_sha256: >- - {{ _gitea_cksm_map[gitea_version][gitea_arch] }} + sha256:{{ gitea_download_url }}.sha256 gitea_download_url: >- https://dl.gitea.io/gitea/{{ gitea_version }}/{{ gitea_bin }} diff --git a/roles/ssh-host-certs/files/reload-ssh-cert.path b/roles/ssh-host-certs/files/reload-ssh-cert.path index f4fdb71..8488c99 100644 --- a/roles/ssh-host-certs/files/reload-ssh-cert.path +++ b/roles/ssh-host-certs/files/reload-ssh-cert.path @@ -1,6 +1,5 @@ [Unit] Description=Watch SSH Host certificates for renewal -After=sshd.service [Path] PathChanged=/etc/ssh/ssh_host_rsa_key-cert.pub