diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-02-14 09:48:32 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-02-15 20:27:53 -0500 |
| commit | 84b377f4bc2ae8aee5729587bc29ac2f9ff1a143 (patch) | |
| tree | ee2b3d6c81519ca267846fb88943b043f3353a7c | |
| parent | 849265d883555a9d741c0b76e911ac01485644d1 (diff) | |
| download | freeipa.git-84b377f4bc2ae8aee5729587bc29ac2f9ff1a143.tar.gz freeipa.git-84b377f4bc2ae8aee5729587bc29ac2f9ff1a143.tar.xz freeipa.git-84b377f4bc2ae8aee5729587bc29ac2f9ff1a143.zip | |
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.
| -rw-r--r-- | install/share/delegation.ldif | 2 | ||||
| -rw-r--r-- | install/share/master-entry.ldif | 4 | ||||
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/install/share/delegation.ldif b/install/share/delegation.ldif index 68b205e8..0fe44746 100644 --- a/install/share/delegation.ldif +++ b/install/share/delegation.ldif @@ -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 diff --git a/install/share/master-entry.ldif b/install/share/master-entry.ldif index ddfb769b..5d3bccf8 100644 --- a/install/share/master-entry.ldif +++ b/install/share/master-entry.ldif @@ -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 diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 94b9d6d0..692a53d4 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 2fb749f1..c66f2a7f 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(), |