summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install/share/delegation.ldif2
-rw-r--r--install/share/master-entry.ldif4
-rw-r--r--ipaserver/install/cainstance.py4
-rw-r--r--ipaserver/install/dsinstance.py4
4 files changed, 7 insertions, 7 deletions
diff --git a/install/share/delegation.ldif b/install/share/delegation.ldif
index 68b205e8e..0fe447466 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 ddfb769bd..5d3bccf83 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 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(),