From e1d6e8083744cf557412b3ba27af5a07fd7ac0b2 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Tue, 8 Sep 2026 12:24:25 +0200 Subject: [PATCH] refactor: use the file extension .yml for all yaml files The role used .yaml while the molecule scenario used .yml, because molecule hard codes molecule.yml and has no fallback for the other extension. Aligning all files on .yml keeps the extension consistent across the repository and avoids surprises when a tool only supports one of both spellings. Co-authored-by: Copilot --- ...{ansible-linters.yaml => ansible-linters.yml} | 0 ...arkdown-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 .vscode/settings.json | 5 +---- .yamllint.yaml => .yamllint.yml | 0 README.md | 2 +- defaults/{main.yaml => main.yml} | 0 handlers/{main.yaml => main.yml} | 0 meta/{argument_specs.yaml => argument_specs.yml} | 0 meta/{main.yaml => main.yml} | 0 package.json | 2 +- requirements.yaml => requirements.yml | 0 ...t_certificate.yaml => client_certificate.yml} | 12 ++++++------ ...import.yaml => client_certificate_import.yml} | 0 ...ted.yaml => client_certificate_protected.yml} | 0 ...d.yaml => client_certificate_unprotected.yml} | 0 tasks/{concatenate.yaml => concatenate.yml} | 0 ...ml => intermediate_certificate_authority.yml} | 12 ++++++------ ...ntermediate_certificate_authority_import.yml} | 0 ...rmediate_certificate_authority_protected.yml} | 0 ...ediate_certificate_authority_unprotected.yml} | 0 tasks/{main.yaml => main.yml} | 16 ++++++++-------- ...ority.yaml => root_certificate_authority.yml} | 8 ++++---- ...aml => root_certificate_authority_import.yml} | 0 ... => root_certificate_authority_protected.yml} | 0 ...> root_certificate_authority_unprotected.yml} | 0 vars/{Archlinux.yaml => Archlinux.yml} | 0 vars/{Debian.yaml => Debian.yml} | 0 vars/{RedHat.yaml => RedHat.yml} | 0 vars/{main.yaml => main.yml} | 2 +- 32 files changed, 28 insertions(+), 31 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 handlers/{main.yaml => main.yml} (100%) rename meta/{argument_specs.yaml => argument_specs.yml} (100%) rename meta/{main.yaml => main.yml} (100%) rename requirements.yaml => requirements.yml (100%) rename tasks/{client_certificate.yaml => client_certificate.yml} (90%) rename tasks/{client_certificate_import.yaml => client_certificate_import.yml} (100%) rename tasks/{client_certificate_protected.yaml => client_certificate_protected.yml} (100%) rename tasks/{client_certificate_unprotected.yaml => client_certificate_unprotected.yml} (100%) rename tasks/{concatenate.yaml => concatenate.yml} (100%) rename tasks/{intermediate_certificate_authority.yaml => intermediate_certificate_authority.yml} (93%) rename tasks/{intermediate_certificate_authority_import.yaml => intermediate_certificate_authority_import.yml} (100%) rename tasks/{intermediate_certificate_authority_protected.yaml => intermediate_certificate_authority_protected.yml} (100%) rename tasks/{intermediate_certificate_authority_unprotected.yaml => intermediate_certificate_authority_unprotected.yml} (100%) rename tasks/{main.yaml => main.yml} (77%) rename tasks/{root_certificate_authority.yaml => root_certificate_authority.yml} (96%) rename tasks/{root_certificate_authority_import.yaml => root_certificate_authority_import.yml} (100%) rename tasks/{root_certificate_authority_protected.yaml => root_certificate_authority_protected.yml} (100%) rename tasks/{root_certificate_authority_unprotected.yaml => root_certificate_authority_unprotected.yml} (100%) rename vars/{Archlinux.yaml => Archlinux.yml} (100%) rename vars/{Debian.yaml => Debian.yml} (100%) rename vars/{RedHat.yaml => RedHat.yml} (100%) rename vars/{main.yaml => main.yml} (75%) 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/.vscode/settings.json b/.vscode/settings.json index e112343..f38d1b1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,13 +2,10 @@ "ansible.python.interpreterPath": "/bin/python", "files.associations": { "**/.gitea/**/*.yml": "yaml", - "**/.gitea/**/*.yaml": "yaml", "docker-compose*.yml": "dockercompose", "*.yml": "ansible", - "*.yaml": "ansible", ".yamllint": "yaml", - ".yamllint.yml": "yaml", - ".yamllint.yaml": "yaml" + ".yamllint.yml": "yaml" }, "rewrap.wrappingColumn": 120 } \ No newline at end of file diff --git a/.yamllint.yaml b/.yamllint.yml similarity index 100% rename from .yamllint.yaml rename to .yamllint.yml diff --git a/README.md b/README.md index 3aaf9dc..6d52983 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The role relies on the modules of the collection `community.crypto`. On Archlinu is additionally required, because it provides the `pacman` module. ```bash -ansible-galaxy collection install -r requirements.yaml +ansible-galaxy collection install -r requirements.yml ``` Facts must be gathered, because the names of the required python packages, the location of the trust store anchor and 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/handlers/main.yaml b/handlers/main.yml similarity index 100% rename from handlers/main.yaml rename to handlers/main.yml diff --git a/meta/argument_specs.yaml b/meta/argument_specs.yml similarity index 100% rename from meta/argument_specs.yaml rename to meta/argument_specs.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/package.json b/package.json index 90e1781..e9fd76b 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "scripts": { "readme:lint": "markdownlint *.md -f", - "readme:parameters": "readme-generator -v defaults/main.yaml -r README.md" + "readme:parameters": "readme-generator -v defaults/main.yml -r README.md" }, "devDependencies": { "@bitnami/readme-generator-for-helm": "^2.5.0", diff --git a/requirements.yaml b/requirements.yml similarity index 100% rename from requirements.yaml rename to requirements.yml diff --git a/tasks/client_certificate.yaml b/tasks/client_certificate.yml similarity index 90% rename from tasks/client_certificate.yaml rename to tasks/client_certificate.yml index 9266ded..766f739 100644 --- a/tasks/client_certificate.yaml +++ b/tasks/client_certificate.yml @@ -26,26 +26,26 @@ created or imported, or point certificate_authority_intermediate_ca_path to an existing one. - name: Create unprotected client certificate - ansible.builtin.include_tasks: client_certificate_unprotected.yaml + ansible.builtin.include_tasks: client_certificate_unprotected.yml when: certificate_authority_client_create is defined and certificate_authority_client_create and certificate_authority_client_tls_key_passphrase is defined and certificate_authority_client_tls_key_passphrase | length <= 0 - name: Create passphrase protected client certificate - ansible.builtin.include_tasks: client_certificate_protected.yaml + ansible.builtin.include_tasks: client_certificate_protected.yml when: certificate_authority_client_create is defined and certificate_authority_client_create and certificate_authority_client_tls_key_passphrase is defined and certificate_authority_client_tls_key_passphrase | length > 0 - name: Import client certificate - ansible.builtin.include_tasks: client_certificate_import.yaml + ansible.builtin.include_tasks: client_certificate_import.yml when: certificate_authority_client_create is defined and not certificate_authority_client_create - name: Create certificate chain file - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_client_path }}/cert.pem" @@ -54,7 +54,7 @@ _concat_mode: "0644" - name: Create certificate fullchain file - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_client_path }}/cert.pem" @@ -63,7 +63,7 @@ _concat_mode: "0644" - name: Create file with private key and fullchain file of the client - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_client_path }}/privkey.pem" diff --git a/tasks/client_certificate_import.yaml b/tasks/client_certificate_import.yml similarity index 100% rename from tasks/client_certificate_import.yaml rename to tasks/client_certificate_import.yml diff --git a/tasks/client_certificate_protected.yaml b/tasks/client_certificate_protected.yml similarity index 100% rename from tasks/client_certificate_protected.yaml rename to tasks/client_certificate_protected.yml diff --git a/tasks/client_certificate_unprotected.yaml b/tasks/client_certificate_unprotected.yml similarity index 100% rename from tasks/client_certificate_unprotected.yaml rename to tasks/client_certificate_unprotected.yml diff --git a/tasks/concatenate.yaml b/tasks/concatenate.yml similarity index 100% rename from tasks/concatenate.yaml rename to tasks/concatenate.yml diff --git a/tasks/intermediate_certificate_authority.yaml b/tasks/intermediate_certificate_authority.yml similarity index 93% rename from tasks/intermediate_certificate_authority.yaml rename to tasks/intermediate_certificate_authority.yml index 2a7152a..64c5689 100644 --- a/tasks/intermediate_certificate_authority.yaml +++ b/tasks/intermediate_certificate_authority.yml @@ -26,26 +26,26 @@ imported, or point certificate_authority_root_ca_path to an existing one. - name: Create unprotected intermediate Certificate Authority (CA) - ansible.builtin.include_tasks: intermediate_certificate_authority_unprotected.yaml + ansible.builtin.include_tasks: intermediate_certificate_authority_unprotected.yml when: certificate_authority_intermediate_ca_create is defined and certificate_authority_intermediate_ca_create and certificate_authority_intermediate_ca_tls_key_passphrase is defined and certificate_authority_intermediate_ca_tls_key_passphrase | length <= 0 - name: Create passphrase protected intermediate Certificate Authority (CA) - ansible.builtin.include_tasks: intermediate_certificate_authority_protected.yaml + ansible.builtin.include_tasks: intermediate_certificate_authority_protected.yml when: certificate_authority_intermediate_ca_create is defined and certificate_authority_intermediate_ca_create and certificate_authority_intermediate_ca_tls_key_passphrase is defined and certificate_authority_intermediate_ca_tls_key_passphrase | length > 0 - name: Import intermediate Certificate Authority (CA) - ansible.builtin.include_tasks: intermediate_certificate_authority_import.yaml + ansible.builtin.include_tasks: intermediate_certificate_authority_import.yml when: certificate_authority_intermediate_ca_create is defined and not certificate_authority_intermediate_ca_create - name: Create certificate chain file - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_intermediate_ca_path }}/cert.pem" @@ -54,7 +54,7 @@ _concat_mode: "0644" - name: Create certificate fullchain file - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_intermediate_ca_path }}/cert.pem" @@ -63,7 +63,7 @@ _concat_mode: "0644" - name: Create file with private key and fullchain file of intermediate Certificate Authority (CA) - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_intermediate_ca_path }}/privkey.pem" diff --git a/tasks/intermediate_certificate_authority_import.yaml b/tasks/intermediate_certificate_authority_import.yml similarity index 100% rename from tasks/intermediate_certificate_authority_import.yaml rename to tasks/intermediate_certificate_authority_import.yml diff --git a/tasks/intermediate_certificate_authority_protected.yaml b/tasks/intermediate_certificate_authority_protected.yml similarity index 100% rename from tasks/intermediate_certificate_authority_protected.yaml rename to tasks/intermediate_certificate_authority_protected.yml diff --git a/tasks/intermediate_certificate_authority_unprotected.yaml b/tasks/intermediate_certificate_authority_unprotected.yml similarity index 100% rename from tasks/intermediate_certificate_authority_unprotected.yaml rename to tasks/intermediate_certificate_authority_unprotected.yml diff --git a/tasks/main.yaml b/tasks/main.yml similarity index 77% rename from tasks/main.yaml rename to tasks/main.yml index 1ff1ce2..0e8597d 100644 --- a/tasks/main.yaml +++ b/tasks/main.yml @@ -5,11 +5,11 @@ vars: params: files: - - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['architecture'] }}.yaml" - - "{{ ansible_facts['distribution'] }}.yaml" - - "{{ ansible_facts['os_family'] }}_{{ ansible_facts['architecture'] }}.yaml" - - "{{ ansible_facts['os_family'] }}.yaml" - - main.yaml + - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['architecture'] }}.yml" + - "{{ ansible_facts['distribution'] }}.yml" + - "{{ ansible_facts['os_family'] }}_{{ ansible_facts['architecture'] }}.yml" + - "{{ ansible_facts['os_family'] }}.yml" + - main.yml paths: - vars @@ -19,16 +19,16 @@ state: present - name: Create or import a root Certificate Authority (CA) - ansible.builtin.include_tasks: root_certificate_authority.yaml + ansible.builtin.include_tasks: root_certificate_authority.yml when: certificate_authority_root_ca_skip is defined and not certificate_authority_root_ca_skip - name: Create or import a intermediate Certificate Authority (CA) - ansible.builtin.include_tasks: intermediate_certificate_authority.yaml + ansible.builtin.include_tasks: intermediate_certificate_authority.yml when: certificate_authority_intermediate_ca_skip is defined and not certificate_authority_intermediate_ca_skip - name: Create or import a client certificate - ansible.builtin.include_tasks: client_certificate.yaml + ansible.builtin.include_tasks: client_certificate.yml when: certificate_authority_client_skip is defined and not certificate_authority_client_skip diff --git a/tasks/root_certificate_authority.yaml b/tasks/root_certificate_authority.yml similarity index 96% rename from tasks/root_certificate_authority.yaml rename to tasks/root_certificate_authority.yml index dcc276a..3950bfe 100644 --- a/tasks/root_certificate_authority.yaml +++ b/tasks/root_certificate_authority.yml @@ -9,21 +9,21 @@ state: "directory" - name: Create unprotected root Certificate Authority (CA) - ansible.builtin.include_tasks: root_certificate_authority_unprotected.yaml + ansible.builtin.include_tasks: root_certificate_authority_unprotected.yml when: certificate_authority_root_ca_create is defined and certificate_authority_root_ca_create and certificate_authority_root_ca_tls_key_passphrase is defined and certificate_authority_root_ca_tls_key_passphrase | length <= 0 - name: Create passphrase protected root Certificate Authority (CA) - ansible.builtin.include_tasks: root_certificate_authority_protected.yaml + ansible.builtin.include_tasks: root_certificate_authority_protected.yml when: certificate_authority_root_ca_create is defined and certificate_authority_root_ca_create and certificate_authority_root_ca_tls_key_passphrase is defined and certificate_authority_root_ca_tls_key_passphrase | length > 0 - name: Import protected root Certificate Authority (CA) - ansible.builtin.include_tasks: root_certificate_authority_import.yaml + ansible.builtin.include_tasks: root_certificate_authority_import.yml when: certificate_authority_root_ca_create is defined and not certificate_authority_root_ca_create @@ -38,7 +38,7 @@ - fullchain.pem - name: Create file with private key and fullchain file of root Certificate Authority (CA) - ansible.builtin.include_tasks: concatenate.yaml + ansible.builtin.include_tasks: concatenate.yml vars: _concat_sources: - "{{ certificate_authority_root_ca_path }}/privkey.pem" diff --git a/tasks/root_certificate_authority_import.yaml b/tasks/root_certificate_authority_import.yml similarity index 100% rename from tasks/root_certificate_authority_import.yaml rename to tasks/root_certificate_authority_import.yml diff --git a/tasks/root_certificate_authority_protected.yaml b/tasks/root_certificate_authority_protected.yml similarity index 100% rename from tasks/root_certificate_authority_protected.yaml rename to tasks/root_certificate_authority_protected.yml diff --git a/tasks/root_certificate_authority_unprotected.yaml b/tasks/root_certificate_authority_unprotected.yml similarity index 100% rename from tasks/root_certificate_authority_unprotected.yaml rename to tasks/root_certificate_authority_unprotected.yml diff --git a/vars/Archlinux.yaml b/vars/Archlinux.yml similarity index 100% rename from vars/Archlinux.yaml rename to vars/Archlinux.yml diff --git a/vars/Debian.yaml b/vars/Debian.yml similarity index 100% rename from vars/Debian.yaml rename to vars/Debian.yml diff --git a/vars/RedHat.yaml b/vars/RedHat.yml similarity index 100% rename from vars/RedHat.yaml rename to vars/RedHat.yml diff --git a/vars/main.yaml b/vars/main.yml similarity index 75% rename from vars/main.yaml rename to vars/main.yml index 6625c88..9d5c607 100644 --- a/vars/main.yaml +++ b/vars/main.yml @@ -1,6 +1,6 @@ --- # Fallback for distributions without a dedicated vars file. Overridden by the -# os-specific file included in tasks/main.yaml. +# os-specific file included in tasks/main.yml. certificate_authority_python_packages: - python3-cryptography