From 616648a4763fb7f0aa97d284e45d0da7dd05e9ff Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 8 Apr 2016 21:24:26 +0000 Subject: [PATCH] fix incorrect path in docker-registry-proxy template Signed-off-by: Adam Miller --- .../templates/docker-registry-vhost.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 b/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 index 90814fa006..fc100da539 100644 --- a/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 +++ b/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 @@ -41,7 +41,7 @@ {% if auth.type == "ssl" %} SSLVerifyClient none - SSLCACertificateFile {{ auth.ssl.authca_dest }} + SSLCACertificateFile {{ auth.ssl.destdir }}/{{ auth.ssl.authca_dest }} {% endif %} Order deny,allow @@ -49,7 +49,7 @@ {% if auth.type == "basic" %} AuthName "Registry Authentication" AuthType basic - AuthUserFile {{ auth.basic.userfile_dest }} + AuthUserFile {{ auth.basic.destdir }}/{{ auth.basic.userfile_dest }} {% endif %} {% if auth.type == "ssl" %} SSLVerifyClient require