From d14565866db64b8fae8b886debc07ed84c08e1bd Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 29 Nov 2020 21:21:48 -0600 Subject: [PATCH] Prefer Ansible Disitribution over Ansible OS Family --- .../{RedHat => CentOS}/6/etc/logrotate.conf | 0 .../{RedHat => CentOS}/6/etc/logrotate.d/btmp | 0 .../{RedHat => CentOS}/6/etc/logrotate.d/wtmp | 0 .../{RedHat => CentOS}/7/etc/logrotate.conf | 0 .../{RedHat => CentOS}/7/etc/logrotate.d/btmp | 0 .../{RedHat => CentOS}/7/etc/logrotate.d/wtmp | 0 .../{RedHat => CentOS}/8/etc/logrotate.conf | 0 .../{RedHat => CentOS}/8/etc/logrotate.d/btmp | 0 .../{RedHat => CentOS}/8/etc/logrotate.d/wtmp | 0 vars/{RedHat-6-i386.yml => CentOS-6.yml} | 6 ++--- vars/{RedHat-6-x86_64.yml => CentOS-7.yml} | 6 ++--- vars/{RedHat-7-x86_64.yml => CentOS-8.yml} | 6 ++--- vars/{Fedora-29-x86_64.yml => Fedora-29.yml} | 0 vars/{Fedora-30-x86_64.yml => Fedora-30.yml} | 0 vars/{Fedora-31-x86_64.yml => Fedora-31.yml} | 0 vars/{Fedora-32-x86_64.yml => Fedora-32.yml} | 0 vars/{Fedora-33-x86_64.yml => Fedora-33.yml} | 0 vars/RedHat-8-x86_64.yml | 25 ------------------- 18 files changed, 9 insertions(+), 34 deletions(-) rename templates/{RedHat => CentOS}/6/etc/logrotate.conf (100%) rename templates/{RedHat => CentOS}/6/etc/logrotate.d/btmp (100%) rename templates/{RedHat => CentOS}/6/etc/logrotate.d/wtmp (100%) rename templates/{RedHat => CentOS}/7/etc/logrotate.conf (100%) rename templates/{RedHat => CentOS}/7/etc/logrotate.d/btmp (100%) rename templates/{RedHat => CentOS}/7/etc/logrotate.d/wtmp (100%) rename templates/{RedHat => CentOS}/8/etc/logrotate.conf (100%) rename templates/{RedHat => CentOS}/8/etc/logrotate.d/btmp (100%) rename templates/{RedHat => CentOS}/8/etc/logrotate.d/wtmp (100%) rename vars/{RedHat-6-i386.yml => CentOS-6.yml} (58%) rename vars/{RedHat-6-x86_64.yml => CentOS-7.yml} (58%) rename vars/{RedHat-7-x86_64.yml => CentOS-8.yml} (58%) rename vars/{Fedora-29-x86_64.yml => Fedora-29.yml} (100%) rename vars/{Fedora-30-x86_64.yml => Fedora-30.yml} (100%) rename vars/{Fedora-31-x86_64.yml => Fedora-31.yml} (100%) rename vars/{Fedora-32-x86_64.yml => Fedora-32.yml} (100%) rename vars/{Fedora-33-x86_64.yml => Fedora-33.yml} (100%) delete mode 100644 vars/RedHat-8-x86_64.yml diff --git a/templates/RedHat/6/etc/logrotate.conf b/templates/CentOS/6/etc/logrotate.conf similarity index 100% rename from templates/RedHat/6/etc/logrotate.conf rename to templates/CentOS/6/etc/logrotate.conf diff --git a/templates/RedHat/6/etc/logrotate.d/btmp b/templates/CentOS/6/etc/logrotate.d/btmp similarity index 100% rename from templates/RedHat/6/etc/logrotate.d/btmp rename to templates/CentOS/6/etc/logrotate.d/btmp diff --git a/templates/RedHat/6/etc/logrotate.d/wtmp b/templates/CentOS/6/etc/logrotate.d/wtmp similarity index 100% rename from templates/RedHat/6/etc/logrotate.d/wtmp rename to templates/CentOS/6/etc/logrotate.d/wtmp diff --git a/templates/RedHat/7/etc/logrotate.conf b/templates/CentOS/7/etc/logrotate.conf similarity index 100% rename from templates/RedHat/7/etc/logrotate.conf rename to templates/CentOS/7/etc/logrotate.conf diff --git a/templates/RedHat/7/etc/logrotate.d/btmp b/templates/CentOS/7/etc/logrotate.d/btmp similarity index 100% rename from templates/RedHat/7/etc/logrotate.d/btmp rename to templates/CentOS/7/etc/logrotate.d/btmp diff --git a/templates/RedHat/7/etc/logrotate.d/wtmp b/templates/CentOS/7/etc/logrotate.d/wtmp similarity index 100% rename from templates/RedHat/7/etc/logrotate.d/wtmp rename to templates/CentOS/7/etc/logrotate.d/wtmp diff --git a/templates/RedHat/8/etc/logrotate.conf b/templates/CentOS/8/etc/logrotate.conf similarity index 100% rename from templates/RedHat/8/etc/logrotate.conf rename to templates/CentOS/8/etc/logrotate.conf diff --git a/templates/RedHat/8/etc/logrotate.d/btmp b/templates/CentOS/8/etc/logrotate.d/btmp similarity index 100% rename from templates/RedHat/8/etc/logrotate.d/btmp rename to templates/CentOS/8/etc/logrotate.d/btmp diff --git a/templates/RedHat/8/etc/logrotate.d/wtmp b/templates/CentOS/8/etc/logrotate.d/wtmp similarity index 100% rename from templates/RedHat/8/etc/logrotate.d/wtmp rename to templates/CentOS/8/etc/logrotate.d/wtmp diff --git a/vars/RedHat-6-i386.yml b/vars/CentOS-6.yml similarity index 58% rename from vars/RedHat-6-i386.yml rename to vars/CentOS-6.yml index 2830b52..e4a906c 100644 --- a/vars/RedHat-6-i386.yml +++ b/vars/CentOS-6.yml @@ -9,17 +9,17 @@ template_list: group: 'root' mode: '0644' owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' + src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' diff --git a/vars/RedHat-6-x86_64.yml b/vars/CentOS-7.yml similarity index 58% rename from vars/RedHat-6-x86_64.yml rename to vars/CentOS-7.yml index 2830b52..e4a906c 100644 --- a/vars/RedHat-6-x86_64.yml +++ b/vars/CentOS-7.yml @@ -9,17 +9,17 @@ template_list: group: 'root' mode: '0644' owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' + src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' diff --git a/vars/RedHat-7-x86_64.yml b/vars/CentOS-8.yml similarity index 58% rename from vars/RedHat-7-x86_64.yml rename to vars/CentOS-8.yml index 2830b52..e4a906c 100644 --- a/vars/RedHat-7-x86_64.yml +++ b/vars/CentOS-8.yml @@ -9,17 +9,17 @@ template_list: group: 'root' mode: '0644' owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp' + 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_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' + src: '{{ ansible_distribution }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' diff --git a/vars/Fedora-29-x86_64.yml b/vars/Fedora-29.yml similarity index 100% rename from vars/Fedora-29-x86_64.yml rename to vars/Fedora-29.yml diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30.yml similarity index 100% rename from vars/Fedora-30-x86_64.yml rename to vars/Fedora-30.yml diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31.yml similarity index 100% rename from vars/Fedora-31-x86_64.yml rename to vars/Fedora-31.yml diff --git a/vars/Fedora-32-x86_64.yml b/vars/Fedora-32.yml similarity index 100% rename from vars/Fedora-32-x86_64.yml rename to vars/Fedora-32.yml diff --git a/vars/Fedora-33-x86_64.yml b/vars/Fedora-33.yml similarity index 100% rename from vars/Fedora-33-x86_64.yml rename to vars/Fedora-33.yml diff --git a/vars/RedHat-8-x86_64.yml b/vars/RedHat-8-x86_64.yml deleted file mode 100644 index 2830b52..0000000 --- a/vars/RedHat-8-x86_64.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# vars file for ensure_log_rotation -package_list: - - name: 'logrotate' - state: 'present' -template_list: - - dest: '/etc/logrotate.conf' - force: 'yes' - group: 'root' - mode: '0644' - owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.conf' - - dest: '/etc/logrotate.d/btmp' - force: 'yes' - group: 'root' - mode: '0644' - owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/btmp' - - dest: '/etc/logrotate.d/wtmp' - force: 'yes' - group: 'root' - mode: '0644' - owner: 'root' - src: '{{ ansible_os_family }}/{{ ansible_distribution_major_version }}/etc/logrotate.d/wtmp' -