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