From afd4288ebdff9d2a3fdeb7189052d541b992d9d4 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Thu, 10 Sep 2026 22:06:43 +0200 Subject: [PATCH] refactor: use the yml extension for every yaml file The repository mixed both extensions, the molecule scenario used yml while the role itself used yaml. The yml extension is the one ansible-galaxy and molecule generate, so it is applied throughout and across the sibling roles. The include_tasks calls in tasks/main.yml and tasks/create_unix_user.yml name their target explicitly and were adjusted accordingly, otherwise the role would no longer find the included task files. Co-authored-by: Copilot --- .../{ansible-linters.yaml => ansible-linters.yml} | 0 .../{markdown-linters.yaml => markdown-linters.yml} | 0 .gitea/workflows/{molecule.yaml => molecule.yml} | 0 .gitea/workflows/{release.yaml => release.yml} | 0 .markdownlint.yaml => .markdownlint.yml | 0 .yamllint.yaml => .yamllint.yml | 0 defaults/{main.yaml => main.yml} | 0 meta/{main.yaml => main.yml} | 0 tasks/{copy_skel_file.yaml => copy_skel_file.yml} | 0 ...create_shell_rc_file.yaml => create_shell_rc_file.yml} | 0 tasks/{create_unix_group.yaml => create_unix_group.yml} | 0 tasks/{create_unix_user.yaml => create_unix_user.yml} | 4 ++-- tasks/{main.yaml => main.yml} | 8 ++++---- tasks/{remove_unix_group.yaml => remove_unix_group.yml} | 0 tasks/{remove_unix_user.yaml => remove_unix_user.yml} | 0 15 files changed, 6 insertions(+), 6 deletions(-) rename .gitea/workflows/{ansible-linters.yaml => ansible-linters.yml} (100%) rename .gitea/workflows/{markdown-linters.yaml => markdown-linters.yml} (100%) rename .gitea/workflows/{molecule.yaml => molecule.yml} (100%) rename .gitea/workflows/{release.yaml => release.yml} (100%) rename .markdownlint.yaml => .markdownlint.yml (100%) rename .yamllint.yaml => .yamllint.yml (100%) rename defaults/{main.yaml => main.yml} (100%) rename meta/{main.yaml => main.yml} (100%) rename tasks/{copy_skel_file.yaml => copy_skel_file.yml} (100%) rename tasks/{create_shell_rc_file.yaml => create_shell_rc_file.yml} (100%) rename tasks/{create_unix_group.yaml => create_unix_group.yml} (100%) rename tasks/{create_unix_user.yaml => create_unix_user.yml} (98%) rename tasks/{main.yaml => main.yml} (84%) rename tasks/{remove_unix_group.yaml => remove_unix_group.yml} (100%) rename tasks/{remove_unix_user.yaml => remove_unix_user.yml} (100%) diff --git a/.gitea/workflows/ansible-linters.yaml b/.gitea/workflows/ansible-linters.yml similarity index 100% rename from .gitea/workflows/ansible-linters.yaml rename to .gitea/workflows/ansible-linters.yml diff --git a/.gitea/workflows/markdown-linters.yaml b/.gitea/workflows/markdown-linters.yml similarity index 100% rename from .gitea/workflows/markdown-linters.yaml rename to .gitea/workflows/markdown-linters.yml diff --git a/.gitea/workflows/molecule.yaml b/.gitea/workflows/molecule.yml similarity index 100% rename from .gitea/workflows/molecule.yaml rename to .gitea/workflows/molecule.yml diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yml similarity index 100% rename from .gitea/workflows/release.yaml rename to .gitea/workflows/release.yml diff --git a/.markdownlint.yaml b/.markdownlint.yml similarity index 100% rename from .markdownlint.yaml rename to .markdownlint.yml diff --git a/.yamllint.yaml b/.yamllint.yml similarity index 100% rename from .yamllint.yaml rename to .yamllint.yml diff --git a/defaults/main.yaml b/defaults/main.yml similarity index 100% rename from defaults/main.yaml rename to defaults/main.yml diff --git a/meta/main.yaml b/meta/main.yml similarity index 100% rename from meta/main.yaml rename to meta/main.yml diff --git a/tasks/copy_skel_file.yaml b/tasks/copy_skel_file.yml similarity index 100% rename from tasks/copy_skel_file.yaml rename to tasks/copy_skel_file.yml diff --git a/tasks/create_shell_rc_file.yaml b/tasks/create_shell_rc_file.yml similarity index 100% rename from tasks/create_shell_rc_file.yaml rename to tasks/create_shell_rc_file.yml diff --git a/tasks/create_unix_group.yaml b/tasks/create_unix_group.yml similarity index 100% rename from tasks/create_unix_group.yaml rename to tasks/create_unix_group.yml diff --git a/tasks/create_unix_user.yaml b/tasks/create_unix_user.yml similarity index 98% rename from tasks/create_unix_user.yaml rename to tasks/create_unix_user.yml index 2ba2c2d..e0c28b1 100644 --- a/tasks/create_unix_user.yaml +++ b/tasks/create_unix_user.yml @@ -49,7 +49,7 @@ unix_user.value.btrfs block: - name: "Copy skel files" - ansible.builtin.include_tasks: copy_skel_file.yaml + ansible.builtin.include_tasks: copy_skel_file.yml loop_control: loop_var: skel_file with_items: @@ -164,7 +164,7 @@ - name: "Create shell rc files" when: unix_user.value.shell_rc_files is defined - ansible.builtin.include_tasks: create_shell_rc_file.yaml + ansible.builtin.include_tasks: create_shell_rc_file.yml with_items: - "{{ unix_user.value.shell_rc_files }}" loop_control: diff --git a/tasks/main.yaml b/tasks/main.yml similarity index 84% rename from tasks/main.yaml rename to tasks/main.yml index 3341665..6ea2d43 100644 --- a/tasks/main.yaml +++ b/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Remove unix user - ansible.builtin.include_tasks: remove_unix_user.yaml + ansible.builtin.include_tasks: remove_unix_user.yml with_dict: "{{ unix_users }}" loop_control: loop_var: unix_user @@ -11,7 +11,7 @@ unix_user.value.state == 'absent' - name: Remove unix groups - ansible.builtin.include_tasks: remove_unix_group.yaml + ansible.builtin.include_tasks: remove_unix_group.yml with_dict: "{{ unix_groups }}" loop_control: loop_var: unix_group @@ -21,7 +21,7 @@ unix_group.value.state == 'absent' - name: Create unix groups - ansible.builtin.include_tasks: create_unix_group.yaml + ansible.builtin.include_tasks: create_unix_group.yml with_dict: "{{ unix_groups }}" loop_control: loop_var: unix_group @@ -33,7 +33,7 @@ ) - name: Create unix users - ansible.builtin.include_tasks: create_unix_user.yaml + ansible.builtin.include_tasks: create_unix_user.yml no_log: true with_dict: "{{ unix_users }}" loop_control: diff --git a/tasks/remove_unix_group.yaml b/tasks/remove_unix_group.yml similarity index 100% rename from tasks/remove_unix_group.yaml rename to tasks/remove_unix_group.yml diff --git a/tasks/remove_unix_user.yaml b/tasks/remove_unix_user.yml similarity index 100% rename from tasks/remove_unix_user.yaml rename to tasks/remove_unix_user.yml