diff options
Diffstat (limited to 'ipa-server/ipa-install')
| -rw-r--r-- | ipa-server/ipa-install/ipa-replica-install | 29 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 31 | ||||
| -rw-r--r-- | ipa-server/ipa-install/share/Makefile.am | 1 | ||||
| -rw-r--r-- | ipa-server/ipa-install/share/ntpd.sysconfig.template | 8 |
4 files changed, 50 insertions, 19 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install index 93cfc864..234a624b 100644 --- a/ipa-server/ipa-install/ipa-replica-install +++ b/ipa-server/ipa-install/ipa-replica-install @@ -42,6 +42,8 @@ class ReplicaConfig: def parse_options(): from optparse import OptionParser parser = OptionParser() + parser.add_option("-N", "--no-ntp", dest="conf_ntp", action="store_false", + help="do not configure ntp", default=True) parser.add_option("-d", "--debug", dest="debug", action="store_true", default=False, help="gather extra debugging information") @@ -134,7 +136,7 @@ def main(): installutils.standard_logging_setup("ipareplica-install.log", options.debug) top_dir, dir = expand_info(filename) - + config = ReplicaConfig() read_info(dir, config) config.host_name = get_host_name() @@ -171,8 +173,14 @@ def main(): except ldap.INVALID_CREDENTIALS, e : sys.exit("\nThe password provided is incorrect for LDAP server %s" % config.master_host_name) + # Configure ntpd + if options.conf_ntp: + ntp = ntpinstance.NTPInstance() + ntp.create_instance() + + # Configure dirsrv install_ds(config) - + repl = replication.ReplicationManager(config.host_name, config.dirman_password) if repl is None: raise RuntimeError("Unable to connect to LDAP server %s." % config.host_name) @@ -184,18 +192,21 @@ def main(): install_krb(config) install_http(config) - + # Create a Web Gui instance webgui = httpinstance.WebGuiInstance() webgui.create_instance() - # Configure ntpd - ntp = ntpinstance.NTPInstance() - ntp.create_instance() - service.restart("dirsrv") service.restart("krb5kdc") - + + # Call client install script + try: + run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name]) + except Exception, e: + print "Configuration of client side components failed!" + print "ipa-client-install returned: " + str(e) + raise RuntimeError("Failed to configure the client") try: if not os.geteuid()==0: sys.exit("\nYou must be root to run this script.\n") @@ -207,4 +218,4 @@ except Exception, e: for str in traceback.format_tb(sys.exc_info()[2]): message = message + "\n" + str logging.debug(message) - sys.exit(1) + sys.exit(1) diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index aac4123c..b698d682 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -75,6 +75,8 @@ def parse_options(): default=False, help="unattended installation never prompts the user") parser.add_option("", "--uninstall", dest="uninstall", action="store_true", default=False, help="uninstall an existing installation") + parser.add_option("-N", "--no-ntp", dest="conf_ntp", action="store_false", + help="do not configure ntp", default=True) options, args = parser.parse_args() @@ -188,7 +190,7 @@ def read_ds_user(): print "will give this user/group some permissions in specific paths/files" print "to perform server-specific operations." print "" - + ds_user = "" try: pwd.getpwnam('dirsrv') @@ -307,7 +309,7 @@ def main(): if os.getegid() != 0: print "Must be root to setup server" return - + signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGINT, signal_handler) @@ -320,11 +322,11 @@ def main(): print "This program will setup the FreeIPA Server." print "" print "This includes:" + print " * Configure the Network Time Daemon (ntpd)" print " * Create and configure an instance of Directory Server" print " * Create and configure a Kerberos Domain Controller (KDC)" print " * Configure Apache (httpd)" print " * Configure TurboGears" - print " * Configure the Network Time Daemon (ntpd)" print "" print "To accept the default shown in brackets, press the Enter key." print "" @@ -357,7 +359,7 @@ def main(): host_default = options.host_name else: host_default = get_fqdn() - + if options.unattended: try: verify_fqdn(host_default) @@ -397,7 +399,7 @@ def main(): print "from the one provided on the command line. Please fix your DNS" print "or /etc/hosts file and restart the installation." return "-Fatal Error-" - + if options.unattended: if not ip: print "Unable to resolve IP address" @@ -445,6 +447,11 @@ def main(): print "The following operations may take some minutes to complete." print "Please wait until the prompt is returned." + # Configure ntpd + if options.conf_ntp: + ntp = ipaserver.ntpinstance.NTPInstance() + ntp.create_instance() + # Create a directory server instance ds = ipaserver.dsinstance.DsInstance() ds.create_instance(ds_user, realm_name, host_name, domain_name, dm_password) @@ -479,14 +486,10 @@ def main(): # Restart ds and krb after configurations have been changed service.print_msg("restarting the directory server") ds.restart() - + service.print_msg("restarting the KDC") krb.restart() - # Configure ntpd - ntp = ipaserver.ntpinstance.NTPInstance() - ntp.create_instance() - # Set the admin user kerberos password ds.change_admin_password(admin_password) @@ -498,6 +501,14 @@ def main(): fd.write("realm=" + realm_name + "\n") fd.close() + # Call client install script + try: + run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", domain_name, "--server", host_name, "--realm", realm_name]) + except Exception, e: + print "Configuration of client side components failed!" + print "ipa-client-install returned: " + str(e) + return "-Fatal Error-" + print "==============================================================================" print "Setup complete" print "" diff --git a/ipa-server/ipa-install/share/Makefile.am b/ipa-server/ipa-install/share/Makefile.am index 28ad51b9..44afd06a 100644 --- a/ipa-server/ipa-install/share/Makefile.am +++ b/ipa-server/ipa-install/share/Makefile.am @@ -20,6 +20,7 @@ app_DATA = \ krb.con.template \ krbrealm.con.template \ ntp.conf.server.template \ + ntpd.sysconfig.template \ preferences.html.template \ referint-conf.ldif \ dna-posix.ldif \ diff --git a/ipa-server/ipa-install/share/ntpd.sysconfig.template b/ipa-server/ipa-install/share/ntpd.sysconfig.template new file mode 100644 index 00000000..3412a0e8 --- /dev/null +++ b/ipa-server/ipa-install/share/ntpd.sysconfig.template @@ -0,0 +1,8 @@ +# Drop root to id 'ntp:ntp' by default. +OPTIONS="-x -u ntp:ntp -p /var/run/ntpd.pid" + +# Set to 'yes' to sync hw clock after successful ntpdate +SYNC_HWCLOCK=yes + +# Additional options for ntpdate +NTPDATE_OPTIONS="" |