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