IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use FQDN in place of FQHN for consistency in sub_dict.

Browse Source 
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:
Rob Crittenden
2012-02-14 09:48:32 -05:00
parent cf35dfa2bc
commit 65f40aeb8d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/share/delegation.ldif
View File

@@ -52,7 +52,7 @@ objectClass: groupofnames
objectClass: nestedgroup objectClass: nestedgroup
cn: Entitlement Compliance cn: Entitlement Compliance
description: Verify 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 # Add the default privileges

4
install/share/master-entry.ldif
View File

@@ -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 changetype: add
objectclass: top objectclass: top
objectclass: nsContainer objectclass: nsContainer
cn: $FQHN cn: $FQDN

4
ipaserver/install/cainstance.py
View File

@@ -77,7 +77,7 @@ TOMCAT_SERVER_PORT=9701
# information # information
INF_TEMPLATE = """ INF_TEMPLATE = """
[General] [General]
FullMachineName= $FQHN FullMachineName= $FQDN
SuiteSpotUserID= $USER SuiteSpotUserID= $USER
SuiteSpotGroup= $GROUP SuiteSpotGroup= $GROUP
ServerRoot= $SERVER_ROOT ServerRoot= $SERVER_ROOT
@@ -266,7 +266,7 @@ class CADSInstance(service.Service):
def __setup_sub_dict(self): def __setup_sub_dict(self):
server_root = dsinstance.find_server_root() 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(), PASSWORD=self.dm_password, SUFFIX=self.suffix.lower(),
REALM=self.realm_name, USER=PKI_DS_USER, REALM=self.realm_name, USER=PKI_DS_USER,
SERVER_ROOT=server_root, DOMAIN=self.domain, SERVER_ROOT=server_root, DOMAIN=self.domain,

4
ipaserver/install/dsinstance.py
View File

@@ -100,7 +100,7 @@ def is_ds_running(server_id=''):
INF_TEMPLATE = """ INF_TEMPLATE = """
[General] [General]
FullMachineName= $FQHN FullMachineName= $FQDN
SuiteSpotUserID= $USER SuiteSpotUserID= $USER
SuiteSpotGroup= $GROUP SuiteSpotGroup= $GROUP
ServerRoot= $SERVER_ROOT ServerRoot= $SERVER_ROOT
@@ -275,7 +275,7 @@ class DsInstance(service.Service):
def __setup_sub_dict(self): def __setup_sub_dict(self):
server_root = find_server_root() 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, PASSWORD=self.dm_password,
RANDOM_PASSWORD=self.generate_random(), RANDOM_PASSWORD=self.generate_random(),
SUFFIX=self.suffix.lower(), SUFFIX=self.suffix.lower(),