From 17fb38949e1f932785453f125a25c7eb3e833796 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 2 Dec 2022 17:28:32 -0500 Subject: [PATCH] Unify devd file installation style. --- .../gpg/files/{pcscd.conf => pcscd_devd.conf} | 0 ansible/roles/gpg/tasks/freebsd.yaml | 18 +++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) rename ansible/roles/gpg/files/{pcscd.conf => pcscd_devd.conf} (100%) diff --git a/ansible/roles/gpg/files/pcscd.conf b/ansible/roles/gpg/files/pcscd_devd.conf similarity index 100% rename from ansible/roles/gpg/files/pcscd.conf rename to ansible/roles/gpg/files/pcscd_devd.conf diff --git a/ansible/roles/gpg/tasks/freebsd.yaml b/ansible/roles/gpg/tasks/freebsd.yaml index 07972d4..ad85291 100644 --- a/ansible/roles/gpg/tasks/freebsd.yaml +++ b/ansible/roles/gpg/tasks/freebsd.yaml @@ -37,22 +37,10 @@ - name: Install devd Configuration copy: - src: "files/{{ item.src }}" - dest: "{{ item.dest }}" + src: "files/{{ item.src }}_devd.conf" + dest: "/usr/local/etc/devd/{{ item.dest|default(item.src) }}.conf" mode: 0644 owner: root group: wheel loop: - - src: pcscd.conf - dest: /usr/local/etc/devd/pcscd.conf - -- name: Install devd Configuration - copy: - src: "files/{{ item.src }}" - dest: "{{ item.dest }}" - mode: 0644 - owner: root - group: wheel - loop: - - src: pcscd.conf - dest: /usr/local/etc/devd/pcscd.conf + - src: pcscd