From 71a6be28418be9be038ac4be572ad21be1cfeda1 Mon Sep 17 00:00:00 2001 From: AnsibleRoles <> Date: Sun, 5 Jun 2022 20:55:44 +0000 Subject: [PATCH 01/14] 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..ded8de7 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ensure_vim + From 8f26f1a4d97838c98441fdd3b14c23e08b8b3627 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:05:29 -0500 Subject: [PATCH 02/14] Remove nano and set vim as the default editor --- .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 | 7 +++ vars/Fedora-35-default.yml | 7 +++ vars/Fedora-36-default.yml | 7 +++ vars/default.yml | 2 + vars/main.yml | 2 + 13 files changed, 278 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 ded8de7..225dd44 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,38 @@ -# ensure_vim +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..f0fcc22 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# defaults file for ensure_vim + diff --git a/handlers/main.yml b/handlers/main.yml new file mode 100644 index 0000000..8bb910f --- /dev/null +++ b/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ensure_vim \ 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..129af4c --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,122 @@ +--- +# tasks file for ensure_vim +- name: 'include variables' + when: + - ansible_system == 'Linux' + include_vars: + file: '{{ lookup("first_found", findme ) }}' + name: 'ensure_vim' + 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_vim is defined + - ensure_vim.package_list is defined + - ensure_vim.package_list is iterable + - packages[item.name] is not defined + ansible.builtin.package: + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_vim.package_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_vim.package_facts' + - 'ensure_vim.service_facts' +- name: 'ensure configurations' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.template_list is defined + - ensure_vim.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_vim.template_list }}' + loop_control: + label: '{{ item.dest }} will be ensured' + notify: + - 'ensure_vim.package_facts' + - 'ensure_vim.service_facts' +- name: 'ensure services' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.service_list is defined + - ensure_vim.service_list is iterable + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: '{{ item.state }}' + loop: '{{ ensure_vim.service_list }}' + loop_control: + label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_vim.package_facts' + - 'ensure_vim.service_facts' +- name: 'Ensure SELinux is configured' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.selinux_policy is defined + - ensure_vim.selinux_state is defined + ansible.posix.selinux: + policy: '{{ ensure_vim.selinux_policy }}' + state: '{{ ensure_vim.selinux_state }}' + register: 'results' +- name: 'Reboot if required' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.selinux_policy is defined + - ensure_vim.selinux_state is defined + - results is defined + - results.reboot_required is defined + - results.reboot_required + reboot: +- name: 'ensure seboolean' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.seboolean_list is defined + - ensure_vim.seboolean_list is iterable + ansible.posix.seboolean: + name: '{{ item.name }}' + persistent: '{{ item.persistent }}' + state: '{{ item.state }}' + loop: '{{ ensure_vim.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..b734de0 --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - ensure_vim \ 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..ed68b57 --- /dev/null +++ b/vars/Fedora-34-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml new file mode 100644 index 0000000..ed68b57 --- /dev/null +++ b/vars/Fedora-35-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml new file mode 100644 index 0000000..ed68b57 --- /dev/null +++ b/vars/Fedora-36-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' diff --git a/vars/default.yml b/vars/default.yml new file mode 100644 index 0000000..8659d21 --- /dev/null +++ b/vars/default.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_vim \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..8659d21 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ensure_vim \ No newline at end of file From 8795a5cbc51132b8a30d865e21bb17ac7052a1c9 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:30:26 -0500 Subject: [PATCH 03/14] Update handlers --- handlers/main.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 8bb910f..4ccfb8f 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,27 @@ --- -# handlers file for ensure_vim \ No newline at end of file +# handlers file for ensure_vim +- name: 'ensure_vim.package_facts' + ansible.builtin.package_facts: +- name: 'ensure_vim.service_facts' + ansible.builtin.service_facts: +- name: 'ensure_vim.service_reload' + when: + - ansible_system == 'Linux' + - ansible_service_mgr == 'systemd' + - ensure_vim is defined + ansible.builtin.systemd: + daemon_reload: 'yes' +- name: 'ensure_vim.services' + when: + - ansible_system == 'Linux' + - ensure_vim is defined + - ensure_vim.service_list is defined + - ensure_vim.service_list is iterable + - item.state == 'started' + ansible.builtin.service: + enabled: '{{ item.enabled }}' + name: '{{ item.name }}' + state: 'restarted' + loop: '{{ ensure_vim.service_list }}' + loop_control: + label: '{{ item.name }} will be restarted' From 8fa4d26dfa7d085d5f419c412e7f78d4723a6deb Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 5 Jun 2022 16:48:56 -0500 Subject: [PATCH 04/14] Update tasks --- tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 129af4c..f5dfbb9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,7 +35,6 @@ - ensure_vim is defined - ensure_vim.package_list is defined - ensure_vim.package_list is iterable - - packages[item.name] is not defined ansible.builtin.package: name: '{{ item.name }}' state: '{{ item.state }}' From cdb373c772b2766a1ec61fe03152a3c03d54223e Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 6 Dec 2022 21:45:25 -0600 Subject: [PATCH 05/14] Add Fedora 37 --- vars/Fedora-37-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-37-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From 1e2cf18eedf9cad2c01c9f0463311805993e28ee Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 23 Apr 2023 16:44:47 -0500 Subject: [PATCH 06/14] Add Fedora 38 --- vars/Fedora-38-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-38-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From e26663bd31ae07f93bbab761a8a6951dacaaf5a2 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sat, 16 Mar 2024 20:26:09 -0500 Subject: [PATCH 07/14] Add Fedora 39 --- vars/Fedora-39-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-39-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From 2a7221c741639580e69d3fe6fd093aacd59f4680 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 2 Jun 2024 12:28:27 -0500 Subject: [PATCH 08/14] Fedora 40 support Signed-off-by: Jason Rothstein --- vars/Fedora-40-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-40-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From fc480a0586d406a0171bcbc4371c16ee4b84c2da Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Fri, 27 Dec 2024 15:57:19 -0600 Subject: [PATCH 09/14] Fedora 41 Signed-off-by: Jason Rothstein --- vars/Fedora-41-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-41-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From 8285638d49d0d74b9486f3b43aa1572fbd582289 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 27 Apr 2025 12:50:01 -0500 Subject: [PATCH 10/14] Fedora 42 Signed-off-by: Jason Rothstein --- vars/Fedora-42-default.yml | 7 +++++++ 1 file changed, 7 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..ed68b57 --- /dev/null +++ b/vars/Fedora-42-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From bbd73c818eb6e33198954573ba37fc6f4ee4ba06 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Sun, 25 May 2025 20:14:37 -0500 Subject: [PATCH 11/14] Handler Improvements Signed-off-by: Jason Rothstein --- handlers/main.yml | 4 +++- tasks/main.yml | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handlers/main.yml b/handlers/main.yml index 4ccfb8f..9673fad 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -11,7 +11,7 @@ - ensure_vim is defined ansible.builtin.systemd: daemon_reload: 'yes' -- name: 'ensure_vim.services' +- name: 'ensure_vim.service_restart' when: - ansible_system == 'Linux' - ensure_vim is defined @@ -25,3 +25,5 @@ loop: '{{ ensure_vim.service_list }}' loop_control: label: '{{ item.name }} will be restarted' +... + diff --git a/tasks/main.yml b/tasks/main.yml index f5dfbb9..8bccf37 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -67,6 +67,8 @@ notify: - 'ensure_vim.package_facts' - 'ensure_vim.service_facts' + - 'ensure_vim.service_reload' + - 'ensure_vim.service_restart' - name: 'ensure services' when: - ansible_system == 'Linux' @@ -93,6 +95,11 @@ policy: '{{ ensure_vim.selinux_policy }}' state: '{{ ensure_vim.selinux_state }}' register: 'results' + notify: + - 'ensure_vim.package_facts' + - 'ensure_vim.service_facts' + - 'ensure_vim.service_reload' + - 'ensure_vim.service_restart' - name: 'Reboot if required' when: - ansible_system == 'Linux' @@ -116,6 +123,11 @@ loop: '{{ ensure_vim.seboolean_list }}' loop_control: label: '{{ item.name }} will be {{ item.state }}' + notify: + - 'ensure_vim.package_facts' + - 'ensure_vim.service_facts' + - 'ensure_vim.service_reload' + - 'ensure_vim.service_restart' - name: 'flush handlers' meta: 'flush_handlers' From 14da351e6f32132747b7f88e99ae4229020e6291 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Thu, 30 Apr 2026 19:46:18 -0500 Subject: [PATCH 12/14] Fedora 43, 44 Signed-off-by: Jason Rothstein --- vars/Fedora-43-default.yml | 7 +++++++ vars/Fedora-44-default.yml | 7 +++++++ 2 files changed, 14 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..ed68b57 --- /dev/null +++ b/vars/Fedora-43-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml new file mode 100644 index 0000000..ed68b57 --- /dev/null +++ b/vars/Fedora-44-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'nano-default-editor' + state: 'absent' + - name: 'vim-default-editor' + state: 'present' From df13a42912e8da4e3379c8ef61041cddb80221e7 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 22:23:31 -0500 Subject: [PATCH 13/14] Fix ansible core 2.20 and update supported OS list Signed-off-by: Jason Rothstein --- tasks/main.yml | 35 +++++++++++++++++---------------- vars/AlmaLinux-10-default.yml | 7 +++++++ vars/AlmaLinux-8-default.yml | 7 +++++++ vars/AlmaLinux-9-default.yml | 7 +++++++ vars/CentOS-10-default.yml | 7 +++++++ 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-34-default.yml | 7 ------- vars/Fedora-35-default.yml | 7 ------- vars/Fedora-36-default.yml | 7 ------- vars/Fedora-37-default.yml | 7 ------- vars/Fedora-38-default.yml | 7 ------- vars/Fedora-39-default.yml | 7 ------- vars/Fedora-40-default.yml | 7 ------- vars/Fedora-41-default.yml | 7 ------- vars/Fedora-42-default.yml | 4 ++++ vars/Fedora-43-default.yml | 4 ++++ vars/Fedora-44-default.yml | 4 ++++ 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 +++++++ 30 files changed, 156 insertions(+), 73 deletions(-) create mode 100644 vars/AlmaLinux-10-default.yml create mode 100644 vars/AlmaLinux-8-default.yml create mode 100644 vars/AlmaLinux-9-default.yml create mode 100644 vars/CentOS-10-default.yml 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-34-default.yml delete mode 100644 vars/Fedora-35-default.yml delete mode 100644 vars/Fedora-36-default.yml delete mode 100644 vars/Fedora-37-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 8bccf37..5dc3abf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,36 +2,36 @@ # tasks file for ensure_vim - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_vim' 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/' errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' - - packages is not defined + - ansible_facts["system"] == 'Linux' + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' - - services is not defined + - 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_vim is defined - ensure_vim.package_list is defined - ensure_vim.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_vim.service_facts' - name: 'ensure configurations' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.template_list is defined - ensure_vim.template_list is iterable @@ -71,7 +71,7 @@ - 'ensure_vim.service_restart' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.service_list is defined - ensure_vim.service_list is iterable @@ -87,7 +87,7 @@ - 'ensure_vim.service_facts' - name: 'Ensure SELinux is configured' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.selinux_policy is defined - ensure_vim.selinux_state is defined @@ -102,7 +102,7 @@ - 'ensure_vim.service_restart' - name: 'Reboot if required' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.selinux_policy is defined - ensure_vim.selinux_state is defined @@ -112,7 +112,7 @@ reboot: - name: 'ensure seboolean' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.seboolean_list is defined - ensure_vim.seboolean_list is iterable @@ -130,4 +130,5 @@ - 'ensure_vim.service_restart' - name: 'flush handlers' meta: 'flush_handlers' +... diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Debian-11-default.yml b/vars/Debian-11-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-11-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Debian-12-default.yml b/vars/Debian-12-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-12-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Debian-13-default.yml b/vars/Debian-13-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-13-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-34-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-35-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-36-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-37-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-41-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-42-default.yml +++ b/vars/Fedora-42-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-43-default.yml +++ b/vars/Fedora-43-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-44-default.yml +++ b/vars/Fedora-44-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Ubuntu-22-default.yml b/vars/Ubuntu-22-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-22-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Ubuntu-24-default.yml b/vars/Ubuntu-24-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-24-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Ubuntu-26-default.yml b/vars/Ubuntu-26-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-26-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + From 88ee7d94bdab9a59ffc06f71e38691d81cd8381a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Tue, 5 May 2026 18:18:50 -0500 Subject: [PATCH 14/14] 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 9673fad..aca65b1 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -6,14 +6,14 @@ ansible.builtin.service_facts: - name: 'ensure_vim.service_reload' when: - - ansible_system == 'Linux' - - ansible_service_mgr == 'systemd' + - ansible_facts["system"] == 'Linux' + - ansible_facts["service_mgr"] == 'systemd' - ensure_vim is defined ansible.builtin.systemd: daemon_reload: 'yes' - name: 'ensure_vim.service_restart' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.service_list is defined - ensure_vim.service_list is iterable