summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-01-03 08:48:29 -0500
committerSimo Sorce <ssorce@redhat.com>2011-01-07 04:53:50 -0500
commit56f000e9a9330598c5768aee0697c4423500a4fe (patch)
treea3d37ebe67f905c2ae0196927b9bdbd7887c35c1 /install
parent575d014ac5b28a1f14dd37196adc02b7b653baff (diff)
downloadfreeipa-56f000e9a9330598c5768aee0697c4423500a4fe.tar.gz
freeipa-56f000e9a9330598c5768aee0697c4423500a4fe.tar.xz
freeipa-56f000e9a9330598c5768aee0697c4423500a4fe.zip
Allow ipa-dns-install to configure DNS on a replica.
Fixes: https://fedorahosted.org/freeipa/ticket/645
Diffstat (limited to 'install')
-rwxr-xr-xinstall/tools/ipa-dns-install2
-rwxr-xr-xinstall/tools/ipa-replica-install2
-rwxr-xr-xinstall/tools/ipa-replica-prepare2
3 files changed, 4 insertions, 2 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index d4cd1eb76..01967c179 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -115,7 +115,7 @@ def main():
api.bootstrap(**cfg)
api.finalize()
- if bindinstance.dns_container_exists(api.env.host, api.env.realm):
+ if bindinstance.named_conf_exists():
sys.exit("\nDNS is already configured in this IPA server.")
# Check we have a public IP that is associated with the hostname
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 9dda13f4a..ee84e32d3 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -71,6 +71,8 @@ def parse_options():
help="Do not use DNS for hostname lookup during installation")
parser.add_option("--no-pkinit", dest="setup_pkinit", action="store_false",
default=True, help="disables pkinit setup steps")
+ parser.add_option("-U", "--unattended", dest="unattended", action="store_true",
+ default=False, help="unattended installation never prompts the user")
options, args = parser.parse_args()
safe_options = parser.get_safe_opts(options)
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare
index 4529a52fd..0c3388de9 100755
--- a/install/tools/ipa-replica-prepare
+++ b/install/tools/ipa-replica-prepare
@@ -246,7 +246,7 @@ def main():
options.setup_pkinit = False
if options.ip_address:
- if not bindinstance.dns_container_exists(api.env.host, api.env.realm):
+ if not bindinstance.dns_container_exists(api.env.host, api.env.basedn):
print "You can't add a DNS record because DNS is not set up."
sys.exit(1)