|
 |
6ec482 |
From bfc6576c84600adfd8a54acc773a23961e60e98c 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
|
|
|
6ec482 |
index 0f96778f758cb21c01e31ff35e70c79f020aa2d3..c71b257cd9a28c083c8bc95d13a4c1351916a385 100644
|
|
|
6ec482 |
--- a/freeipa.spec.in
|
|
|
6ec482 |
+++ b/freeipa.spec.in
|
|
|
6ec482 |
@@ -1489,6 +1489,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
|
|
|
6ec482 |
index 1f22d120478a6d4019663281d3191a27a5ee09ea..6f49b8bfa88e00388aec17f26169aa3df399193d 100644
|
|
|
6ec482 |
--- a/ipaserver/install/cainstance.py
|
|
|
6ec482 |
+++ b/ipaserver/install/cainstance.py
|
|
|
6ec482 |
@@ -1579,9 +1579,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 |
--
|
|
|
6ec482 |
2.20.1
|
|
|
6ec482 |
|