From 2c76117b607eb68e11afddf4cd4fd6c1149d736c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 7 Apr 2016 22:22:20 +0000 Subject: [PATCH] fix docker-registry-proxy vhost template to use new defaults key names Signed-off-by: Adam Miller --- .../templates/docker-registry-vhost.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 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 462578e485..bde78a5837 100644 --- a/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 +++ b/roles/docker-distribution-proxy/templates/docker-registry-vhost.conf.j2 @@ -1,10 +1,10 @@ - ServerName {{ domainname }} + ServerName {{ servername }} SSLEngine on - SSLCertificateFile {{ sslcertfile }} - SSLCertificateKeyFile {{ sslkeyfile }} + SSLCertificateFile {{ ssl.destdir}}/{{ ssl.certfile_dest }} + SSLCertificateKeyFile {{ ssl.destdir}}/{{ ssl.keyfile_dest }} ## SSL settings recommandation from: https://raymii.org/s/tutorials/Strong_SSL_Security_On_Apache2.html # Anti CRIME