mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-23 15:40:01 -06:00
Add --setup-dns option. It will replace --setup-bind
This commit is contained in:
parent
8d164569d0
commit
296ffe6c61
@ -74,8 +74,11 @@ def parse_options():
|
|||||||
default=False, help="Configure a CA instance")
|
default=False, help="Configure a CA instance")
|
||||||
parser.add_option("--hostname", dest="host_name", help="fully qualified name of server")
|
parser.add_option("--hostname", dest="host_name", help="fully qualified name of server")
|
||||||
parser.add_option("--ip-address", dest="ip_address", help="Master Server IP Address")
|
parser.add_option("--ip-address", dest="ip_address", help="Master Server IP Address")
|
||||||
parser.add_option("--setup-bind", dest="setup_bind", action="store_true",
|
# FIXME: Remove this option
|
||||||
|
parser.add_option("--setup-bind", dest="setup_dns", action="store_true",
|
||||||
default=False, help="configure bind with our zone file")
|
default=False, help="configure bind with our zone file")
|
||||||
|
parser.add_option("--setup-dns", dest="setup_dns", action="store_true",
|
||||||
|
default=False, help="configure bind with our zone")
|
||||||
parser.add_option("-U", "--unattended", dest="unattended", action="store_true",
|
parser.add_option("-U", "--unattended", dest="unattended", action="store_true",
|
||||||
default=False, help="unattended installation never prompts the user")
|
default=False, help="unattended installation never prompts the user")
|
||||||
parser.add_option("", "--uninstall", dest="uninstall", action="store_true",
|
parser.add_option("", "--uninstall", dest="uninstall", action="store_true",
|
||||||
@ -368,7 +371,7 @@ def main():
|
|||||||
print " * Create and configure a Kerberos Key Distribution Center (KDC)"
|
print " * Create and configure a Kerberos Key Distribution Center (KDC)"
|
||||||
print " * Configure Apache (httpd)"
|
print " * Configure Apache (httpd)"
|
||||||
print " * Configure TurboGears"
|
print " * Configure TurboGears"
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
print " * Configure DNS (bind)"
|
print " * Configure DNS (bind)"
|
||||||
if not options.conf_ntp:
|
if not options.conf_ntp:
|
||||||
print ""
|
print ""
|
||||||
@ -390,9 +393,9 @@ def main():
|
|||||||
admin_password = ""
|
admin_password = ""
|
||||||
|
|
||||||
# check bind packages are installed
|
# check bind packages are installed
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
if not bindinstance.check_inst():
|
if not bindinstance.check_inst():
|
||||||
print "--setup-bind was specified but bind or the BIND LDAP plug-in"
|
print "--setup-dns was specified but bind or the BIND LDAP plug-in"
|
||||||
print "is not installed on the system"
|
print "is not installed on the system"
|
||||||
print "Please install bind and the LDAP plug-in and restart the setup program"
|
print "Please install bind and the LDAP plug-in and restart the setup program"
|
||||||
return 1
|
return 1
|
||||||
@ -442,7 +445,7 @@ def main():
|
|||||||
return 1
|
return 1
|
||||||
|
|
||||||
if options.ip_address and options.ip_address != ip:
|
if options.ip_address and options.ip_address != ip:
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
ip = options.ip_address
|
ip = options.ip_address
|
||||||
else:
|
else:
|
||||||
print "Error: the hostname resolves to an IP address that is different"
|
print "Error: the hostname resolves to an IP address that is different"
|
||||||
@ -579,7 +582,7 @@ def main():
|
|||||||
# Create a BIND instance
|
# Create a BIND instance
|
||||||
bind = bindinstance.BindInstance(fstore, dm_password)
|
bind = bindinstance.BindInstance(fstore, dm_password)
|
||||||
bind.setup(host_name, ip_address, realm_name, domain_name)
|
bind.setup(host_name, ip_address, realm_name, domain_name)
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
bind.create_instance()
|
bind.create_instance()
|
||||||
else:
|
else:
|
||||||
bind.create_sample_bind_zone()
|
bind.create_sample_bind_zone()
|
||||||
@ -616,11 +619,11 @@ def main():
|
|||||||
print "\t\t * 80, 443: HTTP/HTTPS"
|
print "\t\t * 80, 443: HTTP/HTTPS"
|
||||||
print "\t\t * 389, 636: LDAP/LDAPS"
|
print "\t\t * 389, 636: LDAP/LDAPS"
|
||||||
print "\t\t * 88, 464: kerberos"
|
print "\t\t * 88, 464: kerberos"
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
print "\t\t * 53: bind"
|
print "\t\t * 53: bind"
|
||||||
print "\t\tUDP Ports:"
|
print "\t\tUDP Ports:"
|
||||||
print "\t\t * 88, 464: kerberos"
|
print "\t\t * 88, 464: kerberos"
|
||||||
if options.setup_bind:
|
if options.setup_dns:
|
||||||
print "\t\t * 53: bind"
|
print "\t\t * 53: bind"
|
||||||
if options.conf_ntp:
|
if options.conf_ntp:
|
||||||
print "\t\t * 123: ntp"
|
print "\t\t * 123: ntp"
|
||||||
|
@ -54,9 +54,9 @@ The IP address of this server
|
|||||||
.TP
|
.TP
|
||||||
\fB\-U\fR, \fB\-\-unattended\fR
|
\fB\-U\fR, \fB\-\-unattended\fR
|
||||||
An unattended installation that will never prompt for user input
|
An unattended installation that will never prompt for user input
|
||||||
.TP
|
.TP
|
||||||
\fB\-\-setup\-bind\fR
|
\fB\-\-setup\-dns\fR
|
||||||
Generate a DNS zone file that contains auto\-discovery records for this IPA server
|
Generate a DNS zone if it does not exist already and configure the DNS server
|
||||||
.TP
|
.TP
|
||||||
\fB\-n\fR, \fB\-\-no\-ntp\fR
|
\fB\-n\fR, \fB\-\-no\-ntp\fR
|
||||||
Do not configure NTP
|
Do not configure NTP
|
||||||
|
Loading…
Reference in New Issue
Block a user