From 65aa2d48ffeeacafd5736db33b9be050153077c3 Mon Sep 17 00:00:00 2001 From: David Kupka Date: Tue, 21 Jun 2016 14:41:17 +0200 Subject: env: Add 'server' variable to api.env https://fedorahosted.org/freeipa/ticket/4739 Reviewed-By: Jan Cholasta --- ipalib/config.py | 9 +++++++++ ipalib/constants.py | 1 + 2 files changed, 10 insertions(+) diff --git a/ipalib/config.py b/ipalib/config.py index 44dedf294..55a95bb98 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -563,6 +563,15 @@ class Env(object): self.jsonrpc_uri = urlunparse(( scheme, netloc, uripath, params, query, fragment)) + if 'server' not in self: + if 'jsonrpc_uri' in self: + jsonrpc_uri = self.jsonrpc_uri + else: + jsonrpc_uri = defaults.get('jsonrpc_uri') + if jsonrpc_uri: + parsed = urlparse(jsonrpc_uri) + self.server = parsed.netloc + self._merge(**defaults) def _finalize(self, **lastchance): diff --git a/ipalib/constants.py b/ipalib/constants.py index bcddb5b97..4242fe685 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -231,6 +231,7 @@ DEFAULT_CONFIG = ( ('logdir', object), # Directory containing log files ('log', object), # Path to context specific log file ('jsonrpc_uri', object), # derived from xmlrpc_uri in Env._finalize_core() + ('server', object), # derived from jsonrpc_uri in Env._finalize_core() ) -- cgit