From c6d781ee897deb213411f6caba9ae8a1770af732 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 22 May 2015 10:26:22 -0400
Subject: 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                | 5 +++--
 base/server/python/pki/server/deployment/pkihelper.py | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'base/server')

diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
index 18b8527b2..fd4347900 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 bc736a6f5..f3db6a8e1 100644
--- a/base/server/man/man5/pki_default.cfg.5
+++ b/base/server/man/man5/pki_default.cfg.5
@@ -266,9 +266,10 @@ 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>.
+Hostname and port, or URI of the subsystem being cloned.  The URI format is https://<master_hostname>:<master_https_port>
+where the default master hostname and https port are set to be the security domain's hostname and https port.
 
 .SS EXTERNAL CA CERTIFICATE PARAMETERS
 \x'-1'\fBpki_external\fR
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 4f1c136a5..696e3d75a 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -678,7 +678,6 @@ class ConfigurationFile:
             self.confirm_data_exists("pki_clone_pkcs12_path")
             self.confirm_file_exists("pki_clone_pkcs12_path")
             self.confirm_data_exists("pki_clone_replication_security")
-            self.confirm_data_exists("pki_clone_uri")
         elif self.external:
             # External CA
             if not self.external_step_two:
-- 
cgit