summaryrefslogtreecommitdiffstats
path: root/roles/httpd/certificate/tasks
diff options
context:
space:
mode:
authorRalph Bean <rbean@redhat.com>2014-12-08 15:07:41 +0000
committerRalph Bean <rbean@redhat.com>2014-12-08 15:07:41 +0000
commitbf91f58612badd9e2707d76cdf7fe97eba5dc3c5 (patch)
tree15679085fe065ca5c15658aac030def9a73b093c /roles/httpd/certificate/tasks
parent564cd2ce29c5950432b118dc3a05e01c773a8766 (diff)
downloadansible-bf91f58612badd9e2707d76cdf7fe97eba5dc3c5.tar.gz
ansible-bf91f58612badd9e2707d76cdf7fe97eba5dc3c5.tar.xz
ansible-bf91f58612badd9e2707d76cdf7fe97eba5dc3c5.zip
More futzing with cert selection.
Diffstat (limited to 'roles/httpd/certificate/tasks')
-rw-r--r--roles/httpd/certificate/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/httpd/certificate/tasks/main.yml b/roles/httpd/certificate/tasks/main.yml
index 5c7fa1cdb..e37783a0c 100644
--- a/roles/httpd/certificate/tasks/main.yml
+++ b/roles/httpd/certificate/tasks/main.yml
@@ -21,12 +21,12 @@
- name: Copy {{name}}.cert
copy: >
src={{item}}
- dest=/etc/pki/tls/certs/{{item}}
+ dest=/etc/pki/tls/certs/{{item | basename}}
owner=root
group=root
mode=0644
with_first_found:
- - "{{cert}}"
+ - "{{private}}/files/httpd/{{cert}}.cert"
- "{{private}}/files/httpd/{{name}}.cert"
notify:
- restart httpd
@@ -37,12 +37,12 @@
- name: Copy {{name}}.key
copy: >
src={{item}}
- dest=/etc/pki/tls/private/{{item}}
+ dest=/etc/pki/tls/private/{{item | basename}}
owner=root
group=root
mode=0600
with_first_found:
- - "{{key}}"
+ - "{{private}}/files/httpd/{{key}}.key"
- "{{private}}/files/httpd/{{name}}.key"
notify:
- restart httpd