diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2007-12-13 09:31:28 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2007-12-13 09:31:28 +0000 |
| commit | 2a036abe7a601bbc8e65bbe4ab7c489b81db0eb5 (patch) | |
| tree | 23fb1a23db82d5d5978e398c3d562aa4dcee32f5 /ipa-server/ipaserver/ntpinstance.py | |
| parent | a39f1cb2cba6eb934ba0601471d55ca180415402 (diff) | |
| download | freeipa-2a036abe7a601bbc8e65bbe4ab7c489b81db0eb5.tar.gz freeipa-2a036abe7a601bbc8e65bbe4ab7c489b81db0eb5.tar.xz freeipa-2a036abe7a601bbc8e65bbe4ab7c489b81db0eb5.zip | |
More ipautil fixing
Recently, dsinstance and krbinstance was fixed to
not import * from ipautil; do the same for the
rest of ipaserver.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'ipa-server/ipaserver/ntpinstance.py')
| -rw-r--r-- | ipa-server/ipaserver/ntpinstance.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipa-server/ipaserver/ntpinstance.py b/ipa-server/ipaserver/ntpinstance.py index 46841b0b2..3872d93c6 100644 --- a/ipa-server/ipaserver/ntpinstance.py +++ b/ipa-server/ipaserver/ntpinstance.py @@ -17,10 +17,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -from ipa.ipautil import * import shutil import service +from ipa import ipautil class NTPInstance(service.Service): def __init__(self): @@ -36,9 +36,9 @@ class NTPInstance(service.Service): # 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"): + if ipautil.file_exists("/etc/fedora-release"): os = "fedora." - elif file_exists("/etc/redhat-release"): + elif ipautil.file_exists("/etc/redhat-release"): os = "rhel." sub_dict = { } @@ -46,7 +46,7 @@ class NTPInstance(service.Service): 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) + ntp_conf = ipautil.template_file(ipautil.SHARE_DIR + "ntp.conf.server.template", sub_dict) shutil.copy("/etc/ntp.conf", "/etc/ntp.conf.ipasave") |