[Pki-devel] [PATCH] 600 Added deployment parameters to construct pki_clone_uri.

[Endi Sukma Dewata]

New parameters have been added into the default.cfg to specify the
master hostname and port for pki_clone_uri. By default they point
to the security domain. The man page has been updated as well.

https://fedorahosted.org/pki/ticket/1385

-- 
Endi S. Dewata
-------------- next part --------------
From 44f684c1dac22eda45733e8189450d07405ea7db Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata at redhat.com>
Date: Fri, 22 May 2015 10:26:22 -0400
Subject: [PATCH] Added deployment parameters to construct pki_clone_uri.

New parameters have been added into the default.cfg to specify the
master hostname and port for pki_clone_uri. By default they point
to the security domain. The man page has been updated as well.

https://fedorahosted.org/pki/ticket/1385
---
 base/server/etc/default.cfg            | 4 +++-
 base/server/man/man5/pki_default.cfg.5 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
index 18b8527b201b64108230b645a5cb079fdc1435dd..fd4347900c6fd602b00f7cf84fde74f432e860ed 100644
--- a/base/server/etc/default.cfg
+++ b/base/server/etc/default.cfg
@@ -194,7 +194,9 @@ pki_clone_replication_master_port=
 pki_clone_replication_clone_port=
 pki_clone_replication_security=None
 pki_clone_setup_replication=True
-pki_clone_uri=
+pki_master_hostname=%(pki_security_domain_hostname)s
+pki_master_https_port=%(pki_security_domain_https_port)s
+pki_clone_uri=https://%(pki_master_hostname)s:%(pki_master_https_port)s
 pki_enable_access_log=True
 pki_enable_java_debugger=False
 pki_enable_on_system_boot=True
diff --git a/base/server/man/man5/pki_default.cfg.5 b/base/server/man/man5/pki_default.cfg.5
index bc736a6f521c2800857e98b472ca8fe074af7bbc..6c99155cc619285656b17f7828b1c6186b1133b1 100644
--- a/base/server/man/man5/pki_default.cfg.5
+++ b/base/server/man/man5/pki_default.cfg.5
@@ -266,9 +266,9 @@ Replicate schema when the replication agreement is set up and the new instance (
 .IP
 The type of security used for the replication data.  This can be set to SSL (using LDAPS), TLS, or None.  Defaults to None.  For SSL and TLS, SSL must be set up for the database instances beforehand.
 .TP
-.B pki_clone_uri
+.B pki_master_hostname, pki_master_https_port, pki_clone_uri
 .IP
-A pointer to the subsystem being cloned.  The format is https://<master_hostname>:<master_https_port>.
+The hostname, port, or URI of the subsystem being cloned.  The URI format is https://<master_hostname>:<master_https_port>.
 
 .SS EXTERNAL CA CERTIFICATE PARAMETERS
 \x'-1'\fBpki_external\fR
-- 
1.9.3