mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Use FQDN in place of FQHN for consistency in sub_dict.
For some reason lost to history the sub_dict in dsinstance and cainstance used FQHN instead of FQDN. This made upgrade scripts not work reliably as the variable might be different depending on context. Use FQDN universally instead.
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user