|
 |
15ff02 |
From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001
|
|
|
15ff02 |
From: Jim Perrin <jperrin@centos.org>
|
|
|
15ff02 |
Date: Wed, 11 Mar 2015 10:37:03 -0500
|
|
|
15ff02 |
Subject: [PATCH] update for new ntp server method
|
|
|
15ff02 |
|
|
|
15ff02 |
---
|
|
|
15ff02 |
ipaplatform/base/paths.py | 1 +
|
|
|
15ff02 |
ipaserver/install/ntpinstance.py | 2 ++
|
|
|
15ff02 |
2 files changed, 3 insertions(+)
|
|
|
15ff02 |
|
|
|
15ff02 |
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
|
|
|
15ff02 |
index af50262..5090062 100644
|
|
|
15ff02 |
--- a/ipaplatform/base/paths.py
|
|
|
15ff02 |
+++ b/ipaplatform/base/paths.py
|
|
|
15ff02 |
@@ -99,6 +99,7 @@ class BasePathNamespace(object):
|
|
|
15ff02 |
PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
|
|
|
15ff02 |
PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"
|
|
|
15ff02 |
ETC_REDHAT_RELEASE = "/etc/redhat-release"
|
|
|
15ff02 |
+ ETC_CENTOS_RELEASE = "/etc/centos-release"
|
|
|
15ff02 |
RESOLV_CONF = "/etc/resolv.conf"
|
|
|
15ff02 |
SAMBA_KEYTAB = "/etc/samba/samba.keytab"
|
|
|
15ff02 |
SMB_CONF = "/etc/samba/smb.conf"
|
|
|
15ff02 |
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
|
|
|
15ff02 |
index c653525..4b0578b 100644
|
|
|
15ff02 |
--- a/ipaserver/install/ntpinstance.py
|
|
|
15ff02 |
+++ b/ipaserver/install/ntpinstance.py
|
|
|
15ff02 |
@@ -44,6 +44,8 @@ class NTPInstance(service.Service):
|
|
|
15ff02 |
os = ""
|
|
|
15ff02 |
if ipautil.file_exists(paths.ETC_FEDORA_RELEASE):
|
|
|
15ff02 |
os = "fedora"
|
|
|
15ff02 |
+ elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE):
|
|
|
15ff02 |
+ os = "centos"
|
|
|
15ff02 |
elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
|
|
|
15ff02 |
os = "rhel"
|
|
|
15ff02 |
|
|
|
15ff02 |
--
|
|
|
15ff02 |
1.8.3.1
|
|
|
15ff02 |
|