|
 |
8ec14d |
From 9800e6fcc16455635e2d774a33009d6fb02646db Mon Sep 17 00:00:00 2001
|
|
|
ac7d03 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
ac7d03 |
Date: Tue, 14 Mar 2017 16:07:15 +0000
|
|
|
ac7d03 |
Subject: [PATCH] Package copy-schema-to-ca.py
|
|
|
ac7d03 |
|
|
|
ac7d03 |
This reverts commit f4c7f1dd8a9ce530a8291219a904686ee47e59c7.
|
|
|
ac7d03 |
---
|
|
|
ac7d03 |
freeipa.spec.in | 1 +
|
|
|
ac7d03 |
ipaserver/install/cainstance.py | 6 ++++--
|
|
|
ac7d03 |
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
ac7d03 |
|
|
|
ac7d03 |
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
|
|
ac7d03 |
index d7f8d11ec553cfe299937e1e5f8cc27caed32b08..a075cbb4e2bd6fb0fecfca96a1568c07a27080af 100644
|
|
|
ac7d03 |
--- a/freeipa.spec.in
|
|
|
ac7d03 |
+++ b/freeipa.spec.in
|
|
|
ac7d03 |
@@ -1285,6 +1285,7 @@ fi
|
|
|
ac7d03 |
# END
|
|
|
ac7d03 |
%dir %{_usr}/share/ipa
|
|
|
ac7d03 |
%{_usr}/share/ipa/wsgi.py*
|
|
|
ac7d03 |
+%{_usr}/share/ipa/copy-schema-to-ca.py*
|
|
|
ac7d03 |
%{_usr}/share/ipa/*.ldif
|
|
|
ac7d03 |
%{_usr}/share/ipa/*.uldif
|
|
|
ac7d03 |
%{_usr}/share/ipa/*.template
|
|
|
ac7d03 |
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
|
|
|
ac7d03 |
index b0e9e8757ec3e3c0d03ed930743ef5a1253b864a..b0d8208cc05b94f697b7b8c81caee9d311e2d0f0 100644
|
|
|
ac7d03 |
--- a/ipaserver/install/cainstance.py
|
|
|
ac7d03 |
+++ b/ipaserver/install/cainstance.py
|
|
|
ac7d03 |
@@ -1311,9 +1311,11 @@ def replica_ca_install_check(config, promote):
|
|
|
ac7d03 |
else:
|
|
|
ac7d03 |
root_logger.critical(
|
|
|
ac7d03 |
'The master CA directory server does not have necessary schema. '
|
|
|
ac7d03 |
- 'Please run copy-schema-to-ca.py on all CA masters.\n'
|
|
|
ac7d03 |
+ 'Please copy the following script to all CA masters and run it '
|
|
|
ac7d03 |
+ 'on them: %s\n'
|
|
|
ac7d03 |
'If you are certain that this is a false positive, use '
|
|
|
ac7d03 |
- '--skip-schema-check.')
|
|
|
ac7d03 |
+ '--skip-schema-check.',
|
|
|
ac7d03 |
+ os.path.join(paths.USR_SHARE_IPA_DIR, 'copy-schema-to-ca.py'))
|
|
|
ac7d03 |
exit('IPA schema missing on master CA directory server')
|
|
|
ac7d03 |
|
|
|
ac7d03 |
|
|
|
ac7d03 |
--
|
|
|
ac7d03 |
2.9.4
|
|
|
ac7d03 |
|