From c866bbaf4f1d333f6b6769dd200fab9ea45d719e Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 22 Nov 2020 14:28:46 -0600
Subject: [PATCH] Enable Fedora 32 and Fedora 33 support

---
 templates/Fedora/32/etc/logrotate.conf   | 20 ++++++++++++++++
 templates/Fedora/32/etc/logrotate.d/btmp |  7 ++++++
 templates/Fedora/32/etc/logrotate.d/wtmp |  8 +++++++
 templates/Fedora/33/etc/logrotate.conf   | 20 ++++++++++++++++
 templates/Fedora/33/etc/logrotate.d/btmp |  7 ++++++
 templates/Fedora/33/etc/logrotate.d/wtmp |  8 +++++++
 vars/Fedora-32-x86_64.yml                | 29 ++++++++++++++++++++++++
 vars/Fedora-33-x86_64.yml                | 29 ++++++++++++++++++++++++
 8 files changed, 128 insertions(+)
 create mode 100644 templates/Fedora/32/etc/logrotate.conf
 create mode 100644 templates/Fedora/32/etc/logrotate.d/btmp
 create mode 100644 templates/Fedora/32/etc/logrotate.d/wtmp
 create mode 100644 templates/Fedora/33/etc/logrotate.conf
 create mode 100644 templates/Fedora/33/etc/logrotate.d/btmp
 create mode 100644 templates/Fedora/33/etc/logrotate.d/wtmp
 create mode 100644 vars/Fedora-32-x86_64.yml
 create mode 100644 vars/Fedora-33-x86_64.yml

diff --git a/templates/Fedora/32/etc/logrotate.conf b/templates/Fedora/32/etc/logrotate.conf
new file mode 100644
index 0000000..8cba9ae
--- /dev/null
+++ b/templates/Fedora/32/etc/logrotate.conf
@@ -0,0 +1,20 @@
+# see "man logrotate" for details
+# rotate log files weekly
+daily
+
+# keep 4 weeks worth of backlogs
+rotate {{ log_retention_days }}
+
+# create new (empty) log files after rotating old ones
+create
+
+# use date as a suffix of the rotated file
+dateext
+
+# uncomment this if you want your log files compressed
+compress
+
+# packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+# system-specific logs may be also be configured here.
diff --git a/templates/Fedora/32/etc/logrotate.d/btmp b/templates/Fedora/32/etc/logrotate.d/btmp
new file mode 100644
index 0000000..0aa1ae1
--- /dev/null
+++ b/templates/Fedora/32/etc/logrotate.d/btmp
@@ -0,0 +1,7 @@
+# no packages own btmp -- we'll rotate it here
+/var/log/btmp {
+    missingok
+    monthly
+    create 0660 root utmp
+    rotate 1
+}
diff --git a/templates/Fedora/32/etc/logrotate.d/wtmp b/templates/Fedora/32/etc/logrotate.d/wtmp
new file mode 100644
index 0000000..cc8a151
--- /dev/null
+++ b/templates/Fedora/32/etc/logrotate.d/wtmp
@@ -0,0 +1,8 @@
+# no packages own wtmp -- we'll rotate it here
+/var/log/wtmp {
+    missingok
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
diff --git a/templates/Fedora/33/etc/logrotate.conf b/templates/Fedora/33/etc/logrotate.conf
new file mode 100644
index 0000000..8cba9ae
--- /dev/null
+++ b/templates/Fedora/33/etc/logrotate.conf
@@ -0,0 +1,20 @@
+# see "man logrotate" for details
+# rotate log files weekly
+daily
+
+# keep 4 weeks worth of backlogs
+rotate {{ log_retention_days }}
+
+# create new (empty) log files after rotating old ones
+create
+
+# use date as a suffix of the rotated file
+dateext
+
+# uncomment this if you want your log files compressed
+compress
+
+# packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+# system-specific logs may be also be configured here.
diff --git a/templates/Fedora/33/etc/logrotate.d/btmp b/templates/Fedora/33/etc/logrotate.d/btmp
new file mode 100644
index 0000000..0aa1ae1
--- /dev/null
+++ b/templates/Fedora/33/etc/logrotate.d/btmp
@@ -0,0 +1,7 @@
+# no packages own btmp -- we'll rotate it here
+/var/log/btmp {
+    missingok
+    monthly
+    create 0660 root utmp
+    rotate 1
+}
diff --git a/templates/Fedora/33/etc/logrotate.d/wtmp b/templates/Fedora/33/etc/logrotate.d/wtmp
new file mode 100644
index 0000000..cc8a151
--- /dev/null
+++ b/templates/Fedora/33/etc/logrotate.d/wtmp
@@ -0,0 +1,8 @@
+# no packages own wtmp -- we'll rotate it here
+/var/log/wtmp {
+    missingok
+    monthly
+    create 0664 root utmp
+    minsize 1M
+    rotate 1
+}
diff --git a/vars/Fedora-32-x86_64.yml b/vars/Fedora-32-x86_64.yml
new file mode 100644
index 0000000..96c7d46
--- /dev/null
+++ b/vars/Fedora-32-x86_64.yml
@@ -0,0 +1,29 @@
+---
+# vars file for ensure_log_rotation
+package_list:
+  - name: 'logrotate'
+    state: 'present'
+service_list:
+  - name: 'logrotate.timer'
+    state: 'started'
+    enabled: 'yes'
+template_list:
+  - dest: '/etc/logrotate.conf'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf'
+  - dest: '/etc/logrotate.d/btmp'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp'
+  - dest: '/etc/logrotate.d/wtmp'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp'
+
diff --git a/vars/Fedora-33-x86_64.yml b/vars/Fedora-33-x86_64.yml
new file mode 100644
index 0000000..96c7d46
--- /dev/null
+++ b/vars/Fedora-33-x86_64.yml
@@ -0,0 +1,29 @@
+---
+# vars file for ensure_log_rotation
+package_list:
+  - name: 'logrotate'
+    state: 'present'
+service_list:
+  - name: 'logrotate.timer'
+    state: 'started'
+    enabled: 'yes'
+template_list:
+  - dest: '/etc/logrotate.conf'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf'
+  - dest: '/etc/logrotate.d/btmp'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp'
+  - dest: '/etc/logrotate.d/wtmp'
+    force: 'yes'
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp'
+