From b9ed1de45cf1456f889e3689aee432b9f80639dd Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Tue, 16 Feb 2016 19:28:49 +0000
Subject: [PATCH] set docker-distribution defaults cert.dir based on http.addr
 instead of hardcoded string

---
 roles/docker-distribution/defaults/main.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/roles/docker-distribution/defaults/main.yml b/roles/docker-distribution/defaults/main.yml
index 41a7d7e9e5..cfc827da2b 100644
--- a/roles/docker-distribution/defaults/main.yml
+++ b/roles/docker-distribution/defaults/main.yml
@@ -5,15 +5,6 @@
 # where to put the config.yml on the remote machine
 conf_path: "/etc/docker-distribution/registry/config.yml"
 
-# Cert information to place certificate files on system
-cert:
-  private_path: "PRIVATE_PATH_TO_CERT_DIR"
-  dir: "/etc/pki/docker/{{ ansible_fqdn }}:5000"
-  src_name: "ca.crt"
-  src_key_name: "ca.key"
-  dest_name: "ca.crt"
-  dest_key_name: "ca.key"
-
 # Config directives
 tls:
   enabled: False
@@ -29,3 +20,13 @@ storage:
     rootdirectory: "/var/lib/registry/"
 http:
   addr: ":5000"
+
+# Cert information to place certificate files on system
+cert:
+  private_path: "PRIVATE_PATH_TO_CERT_DIR"
+  dir: "/etc/pki/docker/{{ ansible_fqdn }}{{ http.addr }}"
+  src_name: "ca.crt"
+  src_key_name: "ca.key"
+  dest_name: "ca.crt"
+  dest_key_name: "ca.key"
+