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 <copilot@github.com>
This commit is contained in:
Vendored
+1
-4
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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",
|
||||
|
||||
@@ -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"
|
||||
+6
-6
@@ -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"
|
||||
@@ -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
|
||||
@@ -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"
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user