From 98a1619e0136b4a9e3d9835d11ecf5ba38f0648c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 12 Apr 2016 14:16:56 +0000 Subject: [PATCH] Let's use the existing pki path Signed-off-by: Patrick Uiterwijk --- roles/fedora-web/registry/tasks/main.yml | 2 +- roles/httpd/proxy/tasks/main.yml | 7 +++++++ .../reverseproxy/templates/reversepassproxy.registry.conf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/fedora-web/registry/tasks/main.yml b/roles/fedora-web/registry/tasks/main.yml index ed50f1d33f..6fa7116d38 100644 --- a/roles/fedora-web/registry/tasks/main.yml +++ b/roles/fedora-web/registry/tasks/main.yml @@ -1,5 +1,5 @@ - name: Copy over the Fedora Server CA cert - copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/httpd/pki/fedora-server-ca.cert + copy: src="{{ private }}/files/fedora-ca.cert" dest=/etc/pki/httpd/fedora-server-ca.cert owner=root group=root mode=0644 notify: - reload httpd diff --git a/roles/httpd/proxy/tasks/main.yml b/roles/httpd/proxy/tasks/main.yml index bf6c5aefa4..b3c84d6ef9 100644 --- a/roles/httpd/proxy/tasks/main.yml +++ b/roles/httpd/proxy/tasks/main.yml @@ -56,3 +56,10 @@ - httpd - httpd/proxy - selinux + +- name: Create pki/httpd + file: path=/etc/pki/httpd state=directory + owner=root group=root mode=0600 + tags: + - httpd + - httpd/proxy diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf index e2c65e17c9..3c67288c6e 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf @@ -8,4 +8,4 @@ ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} SSLVerifyClient optional SSLVerifyDepth 1 -SSLCACertificateFile /etc/httpd/pki/fedora-server-ca.cert +SSLCACertificateFile /etc/pki/httpd/fedora-server-ca.cert