diff --git a/SOURCES/ipa-centos-branding.patch b/SOURCES/ipa-centos-branding.patch new file mode 100644 index 0000000..673cd2f --- /dev/null +++ b/SOURCES/ipa-centos-branding.patch @@ -0,0 +1,38 @@ +From 99efecaf87dc1fc9517efaff441a6a7ce46444eb Mon Sep 17 00:00:00 2001 +From: Jim Perrin +Date: Wed, 11 Mar 2015 10:37:03 -0500 +Subject: [PATCH] update for new ntp server method + +--- + ipaplatform/base/paths.py | 1 + + ipaserver/install/ntpinstance.py | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py +index af50262..5090062 100644 +--- a/ipaplatform/base/paths.py ++++ b/ipaplatform/base/paths.py +@@ -99,6 +99,7 @@ class BasePathNamespace(object): + PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/" + PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf" + ETC_REDHAT_RELEASE = "/etc/redhat-release" ++ ETC_CENTOS_RELEASE = "/etc/centos-release" + RESOLV_CONF = "/etc/resolv.conf" + SAMBA_KEYTAB = "/etc/samba/samba.keytab" + SMB_CONF = "/etc/samba/smb.conf" +diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py +index c653525..4b0578b 100644 +--- a/ipaserver/install/ntpinstance.py ++++ b/ipaserver/install/ntpinstance.py +@@ -44,6 +44,8 @@ class NTPInstance(service.Service): + os = "" + if ipautil.file_exists(paths.ETC_FEDORA_RELEASE): + os = "fedora" ++ elif ipautil.file_exists(paths.ETC_CENTOS_RELEASE): ++ os = "centos" + elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE): + os = "rhel" + +-- +1.8.3.1 + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index 50d5e2f..bd3db07 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -43,10 +43,10 @@ License: GPLv3+ URL: http://www.freeipa.org/ Source0: http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz # RHEL spec file only: START: Change branding to IPA and Identity-Management -Source1: header-logo.png -Source2: login-screen-background.jpg -Source3: login-screen-logo.png -Source4: product-name.png +#Source1: header-logo.png +#Source2: login-screen-background.jpg +#Source3: login-screen-logo.png +#Source4: product-name.png # RHEL spec file only: END: Change branding to IPA and Identity-Management BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -242,6 +242,7 @@ Patch1007: 1007-Do-not-build-tests.patch Patch1008: 1008-RCUE.patch Patch1009: 1009-Do-not-allow-installation-in-FIPS-mode.patch Patch1010: 1010-WebUI-add-API-browser-is-experimental-warning.patch +Patch1011: ipa-centos-branding.patch # RHEL spec file only: END %if ! %{ONLY_CLIENT} @@ -376,7 +377,7 @@ Requires: systemd-python Requires: %{etc_systemd_dir} Requires: gzip # RHEL spec file only: START -Requires: redhat-access-plugin-ipa +# Requires: redhat-access-plugin-ipa # RHEL spec file only: END Conflicts: %{alt_name}-server @@ -585,10 +586,10 @@ for p in %patches ; do done # Red Hat's Identity Management branding -cp %SOURCE1 install/ui/images/header-logo.png -cp %SOURCE2 install/ui/images/login-screen-background.jpg -cp %SOURCE3 install/ui/images/login-screen-logo.png -cp %SOURCE4 install/ui/images/product-name.png +#cp %SOURCE1 install/ui/images/header-logo.png +#cp %SOURCE2 install/ui/images/login-screen-background.jpg +#cp %SOURCE3 install/ui/images/login-screen-logo.png +#cp %SOURCE4 install/ui/images/product-name.png # RHEL spec file only: END %build @@ -1185,6 +1186,9 @@ fi # RHEL spec file only: DELETED: Do not build tests %changelog +* Tue Feb 16 2016 CentOS Sources - 4.2.0-15.el7.centos.6 +- Roll in CentOS Branding + * Tue Feb 2 2016 Jan Cholasta - 4.2.0-15.6 - Resolves: #1298103 ipa-server-upgrade fails if certmonger is not running - always start certmonger during IPA server configuration upgrade