diff options
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 94b9d6d05..692a53d48 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -77,7 +77,7 @@ TOMCAT_SERVER_PORT=9701 # information INF_TEMPLATE = """ [General] -FullMachineName= $FQHN +FullMachineName= $FQDN SuiteSpotUserID= $USER SuiteSpotGroup= $GROUP ServerRoot= $SERVER_ROOT @@ -266,7 +266,7 @@ class CADSInstance(service.Service): def __setup_sub_dict(self): server_root = dsinstance.find_server_root() - self.sub_dict = dict(FQHN=self.fqdn, SERVERID=self.serverid, + self.sub_dict = dict(FQDN=self.fqdn, SERVERID=self.serverid, PASSWORD=self.dm_password, SUFFIX=self.suffix.lower(), REALM=self.realm_name, USER=PKI_DS_USER, SERVER_ROOT=server_root, DOMAIN=self.domain, diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 2fb749f17..c66f2a7f1 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -100,7 +100,7 @@ def is_ds_running(server_id=''): INF_TEMPLATE = """ [General] -FullMachineName= $FQHN +FullMachineName= $FQDN SuiteSpotUserID= $USER SuiteSpotGroup= $GROUP ServerRoot= $SERVER_ROOT @@ -275,7 +275,7 @@ class DsInstance(service.Service): def __setup_sub_dict(self): server_root = find_server_root() - self.sub_dict = dict(FQHN=self.fqdn, SERVERID=self.serverid, + self.sub_dict = dict(FQDN=self.fqdn, SERVERID=self.serverid, PASSWORD=self.dm_password, RANDOM_PASSWORD=self.generate_random(), SUFFIX=self.suffix.lower(), |