|
 |
e3ffab |
From cb9593d1571ed8704ebe33084463b2462a30cab9 Mon Sep 17 00:00:00 2001
|
|
|
e3ffab |
From: Martin Basti <mbasti@redhat.com>
|
|
|
e3ffab |
Date: Fri, 7 Nov 2014 12:45:43 +0100
|
|
|
e3ffab |
Subject: [PATCH] Fix: DNS installer adds invalid zonemgr email
|
|
|
e3ffab |
|
|
|
e3ffab |
Installer adds zonemgr as relative (and invalid) address.
|
|
|
e3ffab |
This fix force installer to use absolute email.
|
|
|
e3ffab |
|
|
|
e3ffab |
Ticket: https://fedorahosted.org/freeipa/ticket/4707
|
|
|
e3ffab |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
e3ffab |
---
|
|
|
e3ffab |
install/share/bind.zone.db.template | 2 +-
|
|
|
e3ffab |
ipaserver/install/bindinstance.py | 2 +-
|
|
|
e3ffab |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
e3ffab |
|
|
|
e3ffab |
diff --git a/install/share/bind.zone.db.template b/install/share/bind.zone.db.template
|
|
|
e3ffab |
index 6795bb01a7d8003a26dcc8a1cbc337550b3c296c..ec175c60825869ea9b86f7d1351a96189028b5d4 100644
|
|
|
e3ffab |
--- a/install/share/bind.zone.db.template
|
|
|
e3ffab |
+++ b/install/share/bind.zone.db.template
|
|
|
e3ffab |
@@ -1,6 +1,6 @@
|
|
|
e3ffab |
$$ORIGIN $DOMAIN.
|
|
|
e3ffab |
$$TTL 86400
|
|
|
e3ffab |
-@ IN SOA $DOMAIN. $ZONEMGR. (
|
|
|
e3ffab |
+@ IN SOA $DOMAIN. $ZONEMGR (
|
|
|
e3ffab |
01 ; serial
|
|
|
e3ffab |
3H ; refresh
|
|
|
e3ffab |
15M ; retry
|
|
|
e3ffab |
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
|
|
|
e3ffab |
index 6cf018e9cda3734a99a8ac5ac1df134e9e4c2293..16894de0a009aacb123cf76072f2556aebc5722f 100644
|
|
|
e3ffab |
--- a/ipaserver/install/bindinstance.py
|
|
|
e3ffab |
+++ b/ipaserver/install/bindinstance.py
|
|
|
e3ffab |
@@ -563,7 +563,7 @@ class BindInstance(service.Service):
|
|
|
e3ffab |
self.no_dnssec_validation=no_dnssec_validation
|
|
|
e3ffab |
|
|
|
e3ffab |
if not zonemgr:
|
|
|
e3ffab |
- self.zonemgr = 'hostmaster.%s' % self.domain
|
|
|
e3ffab |
+ self.zonemgr = 'hostmaster.%s' % normalize_zone(self.domain)
|
|
|
e3ffab |
else:
|
|
|
e3ffab |
self.zonemgr = normalize_zonemgr(zonemgr)
|
|
|
e3ffab |
|
|
|
e3ffab |
--
|
|
|
e3ffab |
2.1.0
|
|
|
e3ffab |
|