diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 97ca33a..3671ede 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: hooks: - id: prettier - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files - id: check-merge-conflict @@ -20,7 +20,7 @@ repos: args: - --allow-missing-credentials - repo: https://github.com/ansible/ansible-lint.git - rev: v6.19.0 + rev: v6.20.3 hooks: - id: ansible-lint files: \.(yaml|yml)$ @@ -29,7 +29,7 @@ repos: hooks: - id: black - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.5 + rev: v0.9.0.6 hooks: - id: shellcheck - repo: https://github.com/gitleaks/gitleaks diff --git a/playbooks/roles/generate_secrets/tasks/create-directories.yml b/playbooks/roles/generate_secrets/tasks/create-directories.yml index 24106a8..955559d 100644 --- a/playbooks/roles/generate_secrets/tasks/create-directories.yml +++ b/playbooks/roles/generate_secrets/tasks/create-directories.yml @@ -4,6 +4,6 @@ --- - name: Create secrets directory hierarchy ansible.builtin.file: - path: "{{ path_to_secrets }}" + path: "{{ generate_secrets_path }}" state: directory mode: 0755 diff --git a/playbooks/roles/generate_secrets/tasks/generate-cert.yml b/playbooks/roles/generate_secrets/tasks/generate-cert.yml index 3359b16..640362c 100644 --- a/playbooks/roles/generate_secrets/tasks/generate-cert.yml +++ b/playbooks/roles/generate_secrets/tasks/generate-cert.yml @@ -10,7 +10,7 @@ - name: Generate OpenSSL private keys openssl_privatekey: - path: "{{ path_to_secrets }}/{{ item }}" + path: "{{ generate_secrets_path }}/{{ item }}" loop: - private-key.pem - privkey.pem @@ -19,24 +19,24 @@ - name: Generate OpenSSL CSR openssl_csr: - path: "{{ path_to_secrets }}/{{ item.csr }}" - privatekey_path: "{{ path_to_secrets }}/{{ item.key }}" + path: "{{ generate_secrets_path }}/{{ item.csr }}" + privatekey_path: "{{ generate_secrets_path }}/{{ item.key }}" common_name: localhost loop: - { key: privkey.pem, csr: fullchain.csr } - name: Generate Self Signed OpenSSL certificate openssl_certificate: - path: "{{ path_to_secrets }}/{{ item.cert }}" - privatekey_path: "{{ path_to_secrets }}/{{ item.key }}" - csr_path: "{{ path_to_secrets }}/{{ item.csr }}" + path: "{{ generate_secrets_path }}/{{ item.cert }}" + privatekey_path: "{{ generate_secrets_path }}/{{ item.key }}" + csr_path: "{{ generate_secrets_path }}/{{ item.csr }}" provider: selfsigned loop: - { cert: fullchain.pem, key: privkey.pem, csr: fullchain.csr } - name: Remove CSR ansible.builtin.file: - path: "{{ path_to_secrets }}/{{ item }}" + path: "{{ generate_secrets_path }}/{{ item }}" state: absent loop: - fullchain.csr diff --git a/playbooks/roles/generate_secrets/tasks/generate-configs.yml b/playbooks/roles/generate_secrets/tasks/generate-configs.yml index 2aa0bef..e0fdabe 100644 --- a/playbooks/roles/generate_secrets/tasks/generate-configs.yml +++ b/playbooks/roles/generate_secrets/tasks/generate-configs.yml @@ -5,7 +5,7 @@ - name: Generate config files ansible.builtin.copy: src: "{{ item }}" - dest: "{{ path_to_secrets }}/{{ item }}" + dest: "{{ generate_secrets_path }}/{{ item }}" mode: 0644 loop: - packit-service.yaml.j2 diff --git a/playbooks/roles/generate_secrets/tasks/generate-ssh.yml b/playbooks/roles/generate_secrets/tasks/generate-ssh.yml index aa63772..3f5af5a 100644 --- a/playbooks/roles/generate_secrets/tasks/generate-ssh.yml +++ b/playbooks/roles/generate_secrets/tasks/generate-ssh.yml @@ -4,5 +4,5 @@ --- - name: Generate an OpenSSH keypair with the default values (4096 bits, rsa) openssh_keypair: - path: "{{ path_to_secrets }}/id_ed25519" + path: "{{ generate_secrets_path }}/id_ed25519" type: "ed25519" diff --git a/playbooks/roles/generate_secrets/tasks/touch-files.yml b/playbooks/roles/generate_secrets/tasks/touch-files.yml index 6043b59..0b58ce3 100644 --- a/playbooks/roles/generate_secrets/tasks/touch-files.yml +++ b/playbooks/roles/generate_secrets/tasks/touch-files.yml @@ -4,7 +4,7 @@ --- - name: Create empty files ansible.builtin.file: - path: "{{ path_to_secrets }}/{{ item }}" + path: "{{ generate_secrets_path }}/{{ item }}" state: touch mode: 0644 loop: diff --git a/playbooks/roles/generate_secrets/vars/main.yml b/playbooks/roles/generate_secrets/vars/main.yml index 2523eb1..b6fd57d 100644 --- a/playbooks/roles/generate_secrets/vars/main.yml +++ b/playbooks/roles/generate_secrets/vars/main.yml @@ -1 +1 @@ -path_to_secrets: "{{ generate_secrets_project_dir }}/secrets/packit/dev" +generate_secrets_path: "{{ generate_secrets_project_dir }}/secrets/packit/dev"