mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-24 16:10:02 -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:
parent
cf35dfa2bc
commit
65f40aeb8d
@ -52,7 +52,7 @@ objectClass: groupofnames
|
||||
objectClass: nestedgroup
|
||||
cn: Entitlement Compliance
|
||||
description: Verify entitlement compliance
|
||||
member: fqdn=$FQHN,cn=computers,cn=accounts,$SUFFIX
|
||||
member: fqdn=$FQDN,cn=computers,cn=accounts,$SUFFIX
|
||||
|
||||
############################################
|
||||
# Add the default privileges
|
||||
|
@ -1,5 +1,5 @@
|
||||
dn: cn=$FQHN,cn=masters,cn=ipa,cn=etc,$SUFFIX
|
||||
dn: cn=$FQDN,cn=masters,cn=ipa,cn=etc,$SUFFIX
|
||||
changetype: add
|
||||
objectclass: top
|
||||
objectclass: nsContainer
|
||||
cn: $FQHN
|
||||
cn: $FQDN
|
||||
|
@ -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,
|
||||
|
@ -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(),
|
||||
|
Loading…
Reference in New Issue
Block a user