summaryrefslogtreecommitdiffstats
path: root/ipalib/config.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-06-23 02:06:49 -0400
committerRob Crittenden <rcritten@redhat.com>2011-06-23 02:11:34 -0400
commit8810758c11df8afb5fb7ddf97a71c55a431edfd2 (patch)
tree15065108a07fcd2d22527691b268b61a66b33fee /ipalib/config.py
parent975e2bfa2b48c60bba99e2f2e4f106e031230bd3 (diff)
downloadfreeipa-8810758c11df8afb5fb7ddf97a71c55a431edfd2.tar.gz
freeipa-8810758c11df8afb5fb7ddf97a71c55a431edfd2.tar.xz
freeipa-8810758c11df8afb5fb7ddf97a71c55a431edfd2.zip
Let the framework be able to override the hostname.
The hostname is passed in during the server installation. We should use this hostname for the resulting server as well. It was being discarded and we always used the system hostname value. Important changes: - configure ipa_hostname in sssd on masters - set PKI_HOSTNAME so the hostname is passed to dogtag installer - set the hostname when doing ldapi binds This also reorders some things in the dogtag installer to eliminate an unnecessary restart. We were restarting the service twice in a row with very little time in between and this could result in a slew of reported errors, though the server installed ok. ticket 1052
Diffstat (limited to 'ipalib/config.py')
-rw-r--r--ipalib/config.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/ipalib/config.py b/ipalib/config.py
index 888785a26..410e5f0b2 100644
--- a/ipalib/config.py
+++ b/ipalib/config.py
@@ -447,7 +447,6 @@ class Env(object):
self.__doing('_bootstrap')
# Set run-time variables (cannot be overridden):
- self.host = getfqdn()
self.ipalib = path.dirname(path.abspath(__file__))
self.site_packages = path.dirname(self.ipalib)
self.script = path.abspath(sys.argv[0])
@@ -550,9 +549,6 @@ class Env(object):
if 'log' not in self:
self.log = self._join('logdir', '%s.log' % self.context)
- # FIXME: move into ca plugin
- if 'ca_host' not in self:
- self.ca_host = self.host
self._merge(**defaults)
def _finalize(self, **lastchance):