From d23d38eda37d60f9993db3303f9c98e37609913d Mon Sep 17 00:00:00 2001 From: AnsibleRoles <> Date: Sun, 5 Jun 2022 20:54:57 +0000 Subject: [PATCH 01/16] Initial commit --- .gitignore | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 ++ 2 files changed, 96 insertions(+) create mode 100644 .gitignore create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b7ba4ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,94 @@ +# ---> Linux +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# ---> Windows +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ---> macOS +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# ---> Vim +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# ---> VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + diff --git a/README.md b/README.md new file mode 100644 index 0000000..a08d6c9 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ensure_git + From 725964dcb7454920eb11846eee75364845f2ec74 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 15:59:38 -0500 Subject: [PATCH 02/16] Initial Version --- .travis.yml | 29 +++++++++ README.md | 38 +++++++++++- defaults/main.yml | 3 + handlers/main.yml | 2 + meta/main.yml | 53 ++++++++++++++++ tasks/main.yml | 122 +++++++++++++++++++++++++++++++++++++ tests/inventory | 2 + tests/test.yml | 5 ++ vars/Fedora-34-default.yml | 5 ++ vars/Fedora-35-default.yml | 5 ++ vars/Fedora-36-default.yml | 5 ++ vars/default.yml | 2 + vars/main.yml | 2 + 13 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 .travis.yml create mode 100644 defaults/main.yml create mode 100644 handlers/main.yml create mode 100644 meta/main.yml create mode 100644 tasks/main.yml create mode 100644 tests/inventory create mode 100644 tests/test.yml create mode 100644 vars/Fedora-34-default.yml create mode 100644 vars/Fedora-35-default.yml create mode 100644 vars/Fedora-36-default.yml create mode 100644 vars/default.yml create mode 100644 vars/main.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/README.md b/README.md index a08d6c9..225dd44 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,38 @@ -# ensure_git +Role Name +========= +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..5c13a03 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# defaults file for ensure_git + diff --git a/handlers/main.yml b/handlers/main.yml new file mode 100644 index 0000000..45d4800 --- /dev/null +++ b/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ensure_git \ No newline at end of file diff --git a/meta/main.yml b/meta/main.yml new file mode 100644 index 0000000..227ad9c --- /dev/null +++ b/meta/main.yml @@ -0,0 +1,53 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.9 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. + \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml new file mode 100644 index 0000000..101c586 --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,122 @@ +--- +# tasks file for ensure_git +- name: 'include variables' + when: + - ansible_system == 'Linux' + include_vars: + file: '{{ lookup("first_found", findme ) }}' + name: 'ensure_git' + vars: + findme: + files: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_distribution }}-default.yml' + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' + - '{{ ansible_os_family }}-default.yml' + - 'default.yml' + paths: + - '../vars/' + errors: 'ignore' +- name: 'package discovery' + when: + - ansible_system == 'Linux' + - packages is not defined + ansible.builtin.package_facts: +- name: 'service discovery' + when: + - ansible_system == 'Linux' + - services is not defined + ansible.builtin.service_facts: +- name: 'ensure packages' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.package_list is defined + - ensure_git.package_list is iterable + - packages[item.name] is not defined + ansible.builtin.package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_git.package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_git.package_facts' + - 'ensure_git.service_facts' +- name: 'ensure configurations' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.template_list is defined + - ensure_git.template_list is iterable + ansible.builtin.template: + backup: 'no' + dest: '{{ item.dest }}' + group: '{{ item.group | default(omit) }}' + mode: '{{ item.mode | default(omit) }}' + owner: '{{ item.owner | default(omit) }}' + selevel: '{{ iteml.selevel | default(omit) }}' + serole: '{{ item.serole | default(omit) }}' + setype: '{{ item.setype | default(omit) }}' + seuser: '{{ item.seuser | default(omit) }}' + src: '{{ item.src }}' + loop: '{{ ensure_git.template_list }}' + loop_control: + label: '{{ item.dest }} will be ensured' + notify: + - 'ensure_git.package_facts' + - 'ensure_git.service_facts' +- name: 'ensure services' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.service_list is defined + - ensure_git.service_list is iterable + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_git.service_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_git.package_facts' + - 'ensure_git.service_facts' +- name: 'Ensure SELinux is configured' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.selinux_policy is defined + - ensure_git.selinux_state is defined + ansible.posix.selinux: + policy: '{{ ensure_git.selinux_policy }}' + state: '{{ ensure_git.selinux_state }}' + register: 'results' +- name: 'Reboot if required' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.selinux_policy is defined + - ensure_git.selinux_state is defined + - results is defined + - results.reboot_required is defined + - results.reboot_required + reboot: +- name: 'ensure seboolean' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.seboolean_list is defined + - ensure_git.seboolean_list is iterable + ansible.posix.seboolean: + name: '{{ item.name }}' + persistent: '{{ item.persistent }}' + state: '{{ item.state }}' + loop: '{{ ensure_git.seboolean_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' +- name: 'flush handlers' + meta: 'flush_handlers' + diff --git a/tests/inventory b/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/tests/test.yml b/tests/test.yml new file mode 100644 index 0000000..2b3af09 --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - ensure_git \ No newline at end of file diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml new file mode 100644 index 0000000..d221bdb --- /dev/null +++ b/vars/Fedora-34-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git-libsemanage' + state: 'present' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml new file mode 100644 index 0000000..d221bdb --- /dev/null +++ b/vars/Fedora-35-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git-libsemanage' + state: 'present' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml new file mode 100644 index 0000000..d221bdb --- /dev/null +++ b/vars/Fedora-36-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git-libsemanage' + state: 'present' diff --git a/vars/default.yml b/vars/default.yml new file mode 100644 index 0000000..2406aff --- /dev/null +++ b/vars/default.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_git \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..2406aff --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_git \ No newline at end of file From f24acd039b143edc63908f6ceacfea4a8570eccb Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:08:33 -0500 Subject: [PATCH 03/16] Correct the git package name... --- vars/Fedora-34-default.yml | 2 +- vars/Fedora-35-default.yml | 2 +- vars/Fedora-36-default.yml | 2 +- vars/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml index d221bdb..c774fed 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/Fedora-34-default.yml @@ -1,5 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git-libsemanage' + - name: 'git' state: 'present' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml index d221bdb..c774fed 100644 --- a/vars/Fedora-35-default.yml +++ b/vars/Fedora-35-default.yml @@ -1,5 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git-libsemanage' + - name: 'git' state: 'present' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml index d221bdb..c774fed 100644 --- a/vars/Fedora-36-default.yml +++ b/vars/Fedora-36-default.yml @@ -1,5 +1,5 @@ --- # vars file for ensure_git package_list: - - name: 'git-libsemanage' + - name: 'git' state: 'present' diff --git a/vars/main.yml b/vars/main.yml index 2406aff..8b29a93 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,2 @@ --- -# vars file for ensure_git \ No newline at end of file +# vars file for ensure_git From 532b4173aba9b04e75c51c650de6b348ccdd9aec Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:29:28 -0500 Subject: [PATCH 04/16] Update handlers --- handlers/main.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 45d4800..fa9e847 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,27 @@ --- -# handlers file for ensure_git \ No newline at end of file +# handlers file for ensure_git +- name: 'ensure_git.package_facts' + ansible.builtin.package_facts: +- name: 'ensure_git.service_facts' + ansible.builtin.service_facts: +- name: 'ensure_git.service_reload' + when: + - ansible_system == 'Linux' + - ansible_service_mgr == 'systemd' + - ensure_git is defined + ansible.builtin.systemd: + daemon_reload: 'yes' +- name: 'ensure_git.services' + when: + - ansible_system == 'Linux' + - ensure_git is defined + - ensure_git.service_list is defined + - ensure_git.service_list is iterable + - item.state == 'started' + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: 'restarted' + loop: '{{ ensure_git.service_list }}' + loop_control: + label: '{{ item.name }} will be restarted' From 187a156ea8b3d2f54a317a7d57e12e073851e3b6 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:47:48 -0500 Subject: [PATCH 05/16] Update tasks --- tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 101c586..ec2b954 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,7 +35,6 @@ - ensure_git is defined - ensure_git.package_list is defined - ensure_git.package_list is iterable - - packages[item.name] is not defined ansible.builtin.package: name: '{{ item.name }}' state: '{{ item.state }}' From 650eda56dad8df520956aa125725d83c89560784 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 6 Dec 2022 20:43:47 -0600 Subject: [PATCH 06/16] Add Fedora 37 --- vars/Fedora-37-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-37-default.yml diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-37-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From c35e9f899881c6ecc382407b490625101830576c Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 29 Apr 2023 20:35:13 -0500 Subject: [PATCH 07/16] Add Fedora 38 --- vars/Fedora-38-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-38-default.yml diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-38-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From b4bf5998f6392edae704e9fa829ada35fd40a700 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 16 Mar 2024 20:19:44 -0500 Subject: [PATCH 08/16] Add Fedora 39 --- vars/Fedora-39-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-39-default.yml diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-39-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From 943d8fdeaad95113b370296b3aac6fdaf32ff29f Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 2 Jun 2024 12:16:06 -0500 Subject: [PATCH 09/16] Fedora 40 support Signed-off-by: Jason Rothstein --- vars/Fedora-40-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-40-default.yml diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-40-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From 9a66d0da86517c90bb0a3813af7406d29464da7d Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Fri, 27 Dec 2024 15:53:54 -0600 Subject: [PATCH 10/16] Fedora 41 Signed-off-by: Jason Rothstein --- vars/Fedora-41-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-41-default.yml diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-41-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From 89374746aee38660ae6cf29ec1631d450cc6ebff Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 27 Apr 2025 12:34:04 -0500 Subject: [PATCH 11/16] Fedora 42 Signed-off-by: Jason Rothstein --- vars/Fedora-42-default.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vars/Fedora-42-default.yml diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-42-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From 0dc1846feb99c790422de32341228359d065b6b1 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 May 2025 20:07:09 -0500 Subject: [PATCH 12/16] Handler improvement Signed-off-by: Jason Rothstein --- handlers/main.yml | 4 +++- tasks/main.yml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index fa9e847..8ed876a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -11,7 +11,7 @@ - ensure_git is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_git.services' +- name: 'ensure_git.service_restart' when: - ansible_system == 'Linux' - ensure_git is defined @@ -25,3 +25,5 @@ loop: '{{ ensure_git.service_list }}' loop_control: label: '{{ item.name }} will be restarted' +... + diff --git a/tasks/main.yml b/tasks/main.yml index ec2b954..69c38c9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -67,6 +67,8 @@ notify: - 'ensure_git.package_facts' - 'ensure_git.service_facts' + - 'ensure_git.service_reload' + - 'ensure_git.service_restart' - name: 'ensure services' when: - ansible_system == 'Linux' @@ -93,6 +95,11 @@ policy: '{{ ensure_git.selinux_policy }}' state: '{{ ensure_git.selinux_state }}' register: 'results' + notify: + - 'ensure_git.package_facts' + - 'ensure_git.service_facts' + - 'ensure_git.service_reload' + - 'ensure_git.service_restart' - name: 'Reboot if required' when: - ansible_system == 'Linux' @@ -116,6 +123,12 @@ loop: '{{ ensure_git.seboolean_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_git.package_facts' + - 'ensure_git.service_facts' + - 'ensure_git.service_reload' + - 'ensure_git.service_restart' - name: 'flush handlers' meta: 'flush_handlers' +... From f782f11284402459d6d5b67a9c14ff60d3ba3420 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Wed, 29 Apr 2026 23:41:46 -0500 Subject: [PATCH 13/16] Fedora 43 and 44 --- vars/Fedora-43-default.yml | 5 +++++ vars/Fedora-44-default.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 vars/Fedora-43-default.yml create mode 100644 vars/Fedora-44-default.yml diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-43-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml new file mode 100644 index 0000000..c774fed --- /dev/null +++ b/vars/Fedora-44-default.yml @@ -0,0 +1,5 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' From 8ab0fc6d60c6d2c918b0ec661694c5def7e1b0d2 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 22:15:10 -0500 Subject: [PATCH 14/16] Fix ansible core 2.20 deprecations and make the OS list the supported one Signed-off-by: Jason Rothstein --- tasks/main.yml | 16 ++++++++-------- ...a-34-default.yml => AlmaLinux-10-default.yml} | 2 ++ ...ra-35-default.yml => AlmaLinux-8-default.yml} | 2 ++ ...ra-36-default.yml => AlmaLinux-9-default.yml} | 2 ++ ...dora-37-default.yml => CentOS-10-default.yml} | 2 ++ vars/CentOS-8-default.yml | 7 +++++++ vars/CentOS-9-default.yml | 7 +++++++ vars/Debian-11-default.yml | 7 +++++++ vars/Debian-12-default.yml | 7 +++++++ vars/Debian-13-default.yml | 7 +++++++ vars/Fedora-38-default.yml | 5 ----- vars/Fedora-39-default.yml | 5 ----- vars/Fedora-40-default.yml | 5 ----- vars/Fedora-41-default.yml | 5 ----- vars/Fedora-42-default.yml | 2 ++ vars/Fedora-43-default.yml | 2 ++ vars/Fedora-44-default.yml | 2 ++ vars/OracleLinux-10-default.yml | 7 +++++++ vars/OracleLinux-8-default.yml | 7 +++++++ vars/OracleLinux-9-default.yml | 7 +++++++ vars/Rocky-10-default.yml | 7 +++++++ vars/Rocky-8-default.yml | 7 +++++++ vars/Rocky-9-default.yml | 7 +++++++ vars/Ubuntu-22-default.yml | 7 +++++++ vars/Ubuntu-24-default.yml | 7 +++++++ vars/Ubuntu-26-default.yml | 7 +++++++ 26 files changed, 120 insertions(+), 28 deletions(-) rename vars/{Fedora-34-default.yml => AlmaLinux-10-default.yml} (94%) rename vars/{Fedora-35-default.yml => AlmaLinux-8-default.yml} (94%) rename vars/{Fedora-36-default.yml => AlmaLinux-9-default.yml} (94%) rename vars/{Fedora-37-default.yml => CentOS-10-default.yml} (94%) create mode 100644 vars/CentOS-8-default.yml create mode 100644 vars/CentOS-9-default.yml create mode 100644 vars/Debian-11-default.yml create mode 100644 vars/Debian-12-default.yml create mode 100644 vars/Debian-13-default.yml delete mode 100644 vars/Fedora-38-default.yml delete mode 100644 vars/Fedora-39-default.yml delete mode 100644 vars/Fedora-40-default.yml delete mode 100644 vars/Fedora-41-default.yml create mode 100644 vars/OracleLinux-10-default.yml create mode 100644 vars/OracleLinux-8-default.yml create mode 100644 vars/OracleLinux-9-default.yml create mode 100644 vars/Rocky-10-default.yml create mode 100644 vars/Rocky-8-default.yml create mode 100644 vars/Rocky-9-default.yml create mode 100644 vars/Ubuntu-22-default.yml create mode 100644 vars/Ubuntu-24-default.yml create mode 100644 vars/Ubuntu-26-default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 69c38c9..98d63bb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,12 +9,12 @@ vars: findme: files: - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_distribution }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_os_family }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-default.yml' - 'default.yml' paths: - '../vars/' @@ -22,12 +22,12 @@ - name: 'package discovery' when: - ansible_system == 'Linux' - - packages is not defined + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - ansible_system == 'Linux' - - services is not defined + - ansible_facts["services"] is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: diff --git a/vars/Fedora-34-default.yml b/vars/AlmaLinux-10-default.yml similarity index 94% rename from vars/Fedora-34-default.yml rename to vars/AlmaLinux-10-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/AlmaLinux-10-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/Fedora-35-default.yml b/vars/AlmaLinux-8-default.yml similarity index 94% rename from vars/Fedora-35-default.yml rename to vars/AlmaLinux-8-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-35-default.yml +++ b/vars/AlmaLinux-8-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/Fedora-36-default.yml b/vars/AlmaLinux-9-default.yml similarity index 94% rename from vars/Fedora-36-default.yml rename to vars/AlmaLinux-9-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-36-default.yml +++ b/vars/AlmaLinux-9-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/Fedora-37-default.yml b/vars/CentOS-10-default.yml similarity index 94% rename from vars/Fedora-37-default.yml rename to vars/CentOS-10-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-37-default.yml +++ b/vars/CentOS-10-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/CentOS-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/CentOS-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Debian-11-default.yml b/vars/Debian-11-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Debian-11-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Debian-12-default.yml b/vars/Debian-12-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Debian-12-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Debian-13-default.yml b/vars/Debian-13-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Debian-13-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index c774fed..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# vars file for ensure_git -package_list: - - name: 'git' - state: 'present' diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index c774fed..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# vars file for ensure_git -package_list: - - name: 'git' - state: 'present' diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index c774fed..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# vars file for ensure_git -package_list: - - name: 'git' - state: 'present' diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml deleted file mode 100644 index c774fed..0000000 --- a/vars/Fedora-41-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# vars file for ensure_git -package_list: - - name: 'git' - state: 'present' diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-42-default.yml +++ b/vars/Fedora-42-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-43-default.yml +++ b/vars/Fedora-43-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml index c774fed..3eb8a23 100644 --- a/vars/Fedora-44-default.yml +++ b/vars/Fedora-44-default.yml @@ -3,3 +3,5 @@ package_list: - name: 'git' state: 'present' +... + diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/OracleLinux-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/OracleLinux-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Ubuntu-22-default.yml b/vars/Ubuntu-22-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Ubuntu-22-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Ubuntu-24-default.yml b/vars/Ubuntu-24-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Ubuntu-24-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + diff --git a/vars/Ubuntu-26-default.yml b/vars/Ubuntu-26-default.yml new file mode 100644 index 0000000..3eb8a23 --- /dev/null +++ b/vars/Ubuntu-26-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_git +package_list: + - name: 'git' + state: 'present' +... + From 5311bcc0ff32cd64c01364a37dddd50693dc32b0 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 22:17:49 -0500 Subject: [PATCH 15/16] More ansible 2.20 fixes Signed-off-by: Jason Rothstein --- tasks/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 98d63bb..b490cfb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ # tasks file for ensure_git - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_git' @@ -21,17 +21,17 @@ errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ansible_facts["services"] is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.package_list is defined - ensure_git.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_git.service_facts' - name: 'ensure configurations' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.template_list is defined - ensure_git.template_list is iterable @@ -71,7 +71,7 @@ - 'ensure_git.service_restart' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.service_list is defined - ensure_git.service_list is iterable @@ -87,7 +87,7 @@ - 'ensure_git.service_facts' - name: 'Ensure SELinux is configured' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.selinux_policy is defined - ensure_git.selinux_state is defined @@ -102,7 +102,7 @@ - 'ensure_git.service_restart' - name: 'Reboot if required' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.selinux_policy is defined - ensure_git.selinux_state is defined @@ -112,7 +112,7 @@ reboot: - name: 'ensure seboolean' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.seboolean_list is defined - ensure_git.seboolean_list is iterable From 4efaa9713c914be36e0cb40f94a16f0cc24e56b4 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 18:11:25 -0500 Subject: [PATCH 16/16] More ansible core 2.20 fixes Signed-off-by: Jason Rothstein --- handlers/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 8ed876a..691ebaf 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,14 +6,14 @@ ansible.builtin.service_facts: - name: 'ensure_git.service_reload' when: - - ansible_system == 'Linux' - - ansible_service_mgr == 'systemd' + - ansible_facts["system"] == 'Linux' + - ansible_facts["service_mgr"] == 'systemd' - ensure_git is defined ansible.builtin.systemd: daemon_reload: 'yes' - name: 'ensure_git.service_restart' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_git is defined - ensure_git.service_list is defined - ensure_git.service_list is iterable