pgreco / rpms / ipa

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