NTP configuration for client and server.

Configure ipa servers as an ntp server and clients
to (by default) us the ipa server as an ntp server.

Also corrected the messages about which ports should
be opened.

3 files changed, 51 insertions, 2 deletions

diff --git a/ipa-server/ipaserver/Makefile.am b/ipa-server/ipaserver/Makefile.am
index bba297dd5..b4469b20b 100644
--- a/ipa-server/ipaserver/Makefile.am
+++ b/ipa-server/ipaserver/Makefile.am
@@ -8,6 +8,7 @@ app_PYTHON = 			\
 	ipaldap.py		\
 	krbinstance.py		\
 	httpinstance.py		\
+	ntpinstance.py		\
 	$(NULL)
 
 EXTRA_DIST =			\
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 5ef4a4028..2b4d8f357 100644
--- a/ipa-server/ipaserver/dsinstance.py
+++ b/ipa-server/ipaserver/dsinstance.py
@@ -26,8 +26,6 @@ import logging
 import pwd
 from ipa.ipautil import *
 
-
-SHARE_DIR = "/usr/share/ipa/"
 SERVER_ROOT_64 = "/usr/lib64/dirsrv"
 SERVER_ROOT_32 = "/usr/lib/dirsrv"
 
diff --git a/ipa-server/ipaserver/ntpinstance.py b/ipa-server/ipaserver/ntpinstance.py
new file mode 100644
index 000000000..2667a2026
--- /dev/null
+++ b/ipa-server/ipaserver/ntpinstance.py
@@ -0,0 +1,50 @@
+# Authors: Karl MacMillan <kmacmillan@redhat.com>
+#
+# Copyright (C) 2007  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 or later
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+from ipa.ipautil import *
+import shutil
+
+class NTPInstance:
+    def create_instance(self):
+        # The template sets the config to point towards ntp.pool.org, but
+        # they request that software not point towards the default pool.
+        # We use the OS variable to point it towards either the rhel
+        # or fedora pools. Other distros should be added in the future
+        # or we can get our own pool.
+        os = ""
+        if file_exists("/etc/fedora-release"):
+            os = "fedora."
+        elif file_exists("/etc/redhat-release"):
+            os = "rhel."
+
+        sub_dict = { }
+        sub_dict["SERVERA"] = "0.%spool.ntp.org" % os
+        sub_dict["SERVERB"] = "1.%spool.ntp.org" % os
+        sub_dict["SERVERC"] = "2.%spool.ntp.org" % os
+
+        ntp_conf = template_file(SHARE_DIR + "ntp.conf.server.template", sub_dict)
+
+        shutil.copy("/etc/ntp.conf", "/etc/ntp.conf.ipasave")
+
+        fd = open("/etc/ntp.conf", "w")
+        fd.write(ntp_conf)
+        fd.close()
+
+        # we might consider setting the date manually using ntpd -qg in case
+        # the current time is very far off.