IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-09-03 20:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't report spurious upgrade message if IPA has not been configured yet.

Browse Source 
This was throwing the error
"Unable to determine hostname from ipa-rewrite.conf"
during RPM %post on unconfigured servers where there is nothing to do.

468947
This commit is contained in:
Rob Crittenden
2008-10-29 17:08:32 -04:00
parent f305864d90
commit 4699fc534b
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipa-server/ipa-upgradeconfig
+12 -9
View File
@@ -42,14 +42,13 @@ def update_conf(sub_dict, filename, template_filename):
def find_hostname():
"""Find the hostname currently configured in ipa-rewrite.conf"""
filename="/etc/httpd/conf.d/ipa-rewrite.conf"
if os.path.exists(filename):
pattern = "^[\s#]*.*https:\/\/([A-Za-z0-9\.\-]*)\/.*"
p = re.compile(pattern)
for line in fileinput.input(filename):
if p.search(line):
fileinput.close()
return p.search(line).group(1)
fileinput.close()
pattern = "^[\s#]*.*https:\/\/([A-Za-z0-9\.\-]*)\/.*"
p = re.compile(pattern)
for line in fileinput.input(filename):
if p.search(line):
fileinput.close()
return p.search(line).group(1)
fileinput.close()
return None
@@ -92,7 +91,11 @@ def main():
print "Unable to get default kerberos realm: %s" % e[1]
sys.exit(1)
fqdn = find_hostname()
try:
fqdn = find_hostname()
except IOError:
# ipa-rewrite.conf doesn't exist, nothing to do
sys.exit(0)
if fqdn is None:
print "Unable to determine hostname from ipa-rewrite.conf"