diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-02-20 13:40:13 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-02-20 15:34:45 +0100 |
| commit | e10af0b764fb2d042c6ad730866af508f231c8cb (patch) | |
| tree | b6530905db9e78c34b9e2f4da4a8ca9ede430dc0 /install | |
| parent | 8ec98dfcae3daf1324bf924e1bf1684007bcf9d1 (diff) | |
| download | freeipa-e10af0b764fb2d042c6ad730866af508f231c8cb.tar.gz freeipa-e10af0b764fb2d042c6ad730866af508f231c8cb.tar.xz freeipa-e10af0b764fb2d042c6ad730866af508f231c8cb.zip | |
Ease zonemgr restrictions
Admin e-mail validator currently requires an email to be in
a second-level domain (hostmaster@example.com). This is too
restrictive. Top level domain e-mails (hostmaster@testrelm)
should also be allowed.
This patch also fixes default zonemgr value in help texts and man
pages.
https://fedorahosted.org/freeipa/ticket/2272
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-dns-install | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 2 | ||||
| -rw-r--r-- | install/tools/man/ipa-dns-install.1 | 2 | ||||
| -rw-r--r-- | install/tools/man/ipa-server-install.1 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 70cc00d33..c9014371e 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -51,7 +51,7 @@ def parse_options(): default=False, help="Do not create new reverse DNS zone") parser.add_option("--zonemgr", action="callback", callback=bindinstance.zonemgr_callback, type="string", - help="DNS zone manager e-mail address. Defaults to root") + help="DNS zone manager e-mail address. Defaults to hostmaster@DOMAIN") parser.add_option("--zone-notif", dest="zone_notif", action="store_true", default=False, help="Let name server receive notification when a new zone is added." \ diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 284362206..47f999b4e 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -192,7 +192,7 @@ def parse_options(): default=False, help="Do not create reverse DNS zone") dns_group.add_option("--zonemgr", action="callback", callback=bindinstance.zonemgr_callback, type="string", - help="DNS zone manager e-mail address. Defaults to root") + help="DNS zone manager e-mail address. Defaults to hostmaster@DOMAIN") dns_group.add_option("--zone-notif", dest="zone_notif", action="store_true", default=False, help="Let name server receive notification when a new zone is added." \ diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1 index c9dfbb560..3f40ab7ab 100644 --- a/install/tools/man/ipa-dns-install.1 +++ b/install/tools/man/ipa-dns-install.1 @@ -47,7 +47,7 @@ The reverse DNS zone to use Do not create new reverse DNS zone. If used on a replica and a reverse DNS zone already exists for the subnet, it will be used. .TP \fB\-\-zonemgr\fR -The e\-mail address of the DNS zone manager. Defaults too root@host.domain +The e\-mail address of the DNS zone manager. Defaults to hostmaster@DOMAIN .TP \fB\-\-zone\-notif\fR Let name server receive notifications when a new zone is added. New zone is then immediately loaded by the name server. This feature uses an LDAP Persistent Search mechanism to receive the data. Zone refresh is turned off when zone notifications are enabled. diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index 9870022aa..b69c72059 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -143,7 +143,7 @@ The reverse DNS zone to use Do not create reverse DNS zone .TP \fB\-\-zonemgr\fR -The e\-mail address of the DNS zone manager. Defaults to root@host.domain +The e\-mail address of the DNS zone manager. Defaults to hostmaster@DOMAIN .TP \fB\-\-zone\-notif\fR Let name server receive notifications when a new zone is added. New zone is then immediately loaded by the name server. This feature uses an LDAP Persistent Search mechanism to receive the data. Zone refresh is turned off when zone notifications are enabled. |