diff --git a/basic-system/tasks/logging.yml b/basic-system/tasks/logging.yml index 73ce55c7278f56ededf7d28f035bfd306c967ee7..98402327cd29d7cc063f898116ea18373cd5c26b 100644 --- a/basic-system/tasks/logging.yml +++ b/basic-system/tasks/logging.yml @@ -98,8 +98,8 @@ - syslog - name: ensure our logrotate.conf is present - copy: - src: logrotate.conf + template: + src: logrotate.conf.j2 dest: /etc/logrotate.conf owner: root group: root diff --git a/basic-system/files/logrotate.conf b/basic-system/templates/logrotate.conf.j2 similarity index 90% rename from basic-system/files/logrotate.conf rename to basic-system/templates/logrotate.conf.j2 index 0e3ac370bca9f495559b9285b99a84083e8a9007..2be8fd5c7b8c4bfe8edf52150d96df9343ea9a70 100644 --- a/basic-system/files/logrotate.conf +++ b/basic-system/templates/logrotate.conf.j2 @@ -15,6 +15,7 @@ delaycompress # packages drop log rotation information into this directory include /etc/logrotate.d +{% if ansible_distribution_major_version|int < 10 %} # no packages own wtmp, or btmp -- we'll rotate them here /var/log/wtmp { missingok @@ -29,5 +30,6 @@ include /etc/logrotate.d create 0660 root utmp rotate 1 } +{% endif %} # system-specific logs may be configured here