|
 |
403b09 |
From 41b85da8629e69efcc9acf65ba81ab79d38dc609 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Petr Vobornik <pvoborni@redhat.com>
|
|
|
403b09 |
Date: Fri, 15 Jul 2016 16:25:36 +0200
|
|
|
403b09 |
Subject: [PATCH] unite log file name of ipa-ca-install
|
|
|
403b09 |
|
|
|
403b09 |
ipa-ca-install said that it used
|
|
|
403b09 |
/var/log/ipareplica-ca-install.log
|
|
|
403b09 |
but in fact it used
|
|
|
403b09 |
/var/log/ipaserver-ca-install.log
|
|
|
403b09 |
|
|
|
403b09 |
This patch unites it to ipareplica-ca-install.log
|
|
|
403b09 |
|
|
|
403b09 |
It was chosen because of backwards compatibility - ipareplica-ca-install
|
|
|
403b09 |
was more commonly used. ipaserver-ca-install.log was used only in rare
|
|
|
403b09 |
CA less -> CA installation.
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6086
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
|
|
|
403b09 |
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
|
|
|
403b09 |
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
install/tools/ipa-ca-install | 2 +-
|
|
|
403b09 |
ipaplatform/base/paths.py | 1 -
|
|
|
403b09 |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
|
|
|
403b09 |
index ed685920cbadb9cd3fc80865afb1610ca42f8b13..985e7413aa06900976934c329757ce45da5ff12d 100755
|
|
|
403b09 |
--- a/install/tools/ipa-ca-install
|
|
|
403b09 |
+++ b/install/tools/ipa-ca-install
|
|
|
403b09 |
@@ -285,7 +285,7 @@ def main():
|
|
|
403b09 |
cainstance.is_ca_installed_locally()):
|
|
|
403b09 |
sys.exit("CA is already installed on this host.")
|
|
|
403b09 |
|
|
|
403b09 |
- standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug)
|
|
|
403b09 |
+ standard_logging_setup(log_file_name, debug=options.debug)
|
|
|
403b09 |
root_logger.debug("%s was invoked with options: %s,%s",
|
|
|
403b09 |
sys.argv[0], safe_options, filename)
|
|
|
403b09 |
root_logger.debug("IPA version %s", version.VENDOR_VERSION)
|
|
|
403b09 |
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
|
|
|
403b09 |
index d6fbe32f6839a5db40148777132ba1454cbc3382..1507ac36da5b40447c951ee608053a09b2db2fc3 100644
|
|
|
403b09 |
--- a/ipaplatform/base/paths.py
|
|
|
403b09 |
+++ b/ipaplatform/base/paths.py
|
|
|
403b09 |
@@ -307,7 +307,6 @@ class BasePathNamespace(object):
|
|
|
403b09 |
IPAREPLICA_CONNCHECK_LOG = "/var/log/ipareplica-conncheck.log"
|
|
|
403b09 |
IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log"
|
|
|
403b09 |
IPARESTORE_LOG = "/var/log/iparestore.log"
|
|
|
403b09 |
- IPASERVER_CA_INSTALL_LOG = "/var/log/ipaserver-ca-install.log"
|
|
|
403b09 |
IPASERVER_INSTALL_LOG = "/var/log/ipaserver-install.log"
|
|
|
403b09 |
IPASERVER_KRA_INSTALL_LOG = "/var/log/ipaserver-kra-install.log"
|
|
|
403b09 |
IPASERVER_KRA_UNINSTALL_LOG = "/var/log/ipaserver-kra-uninstall.log"
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|