ipa-ca-install said that it used /var/log/ipareplica-ca-install.log but in fact it used /var/log/ipaserver-ca-install.log
This patch unites it to ipaserver-ca-install.log It was chosen because ipa-ca-install can be also used on master on CA-less -> CA conversion. Term "server" is valid for both master and replica. https://fedorahosted.org/freeipa/ticket/6088 -- Petr Vobornik
From 9af48b0d4c0b0b6d1e51cc320ec9409caa0ec873 Mon Sep 17 00:00:00 2001 From: Petr Vobornik <[email protected]> Date: Fri, 15 Jul 2016 16:25:36 +0200 Subject: [PATCH] unite log file name of ipa-ca-install ipa-ca-install said that it used /var/log/ipareplica-ca-install.log but in fact it used /var/log/ipaserver-ca-install.log This patch unites it to ipaserver-ca-install.log It was chosen because ipa-ca-install can be also used on master on CA-less -> CA conversion. Term "server" is valid for both master and replica. https://fedorahosted.org/freeipa/ticket/6088 --- install/tools/ipa-ca-install | 4 ++-- ipaplatform/base/paths.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index ed685920cbadb9cd3fc80865afb1610ca42f8b13..eee5dee34ac375e16a17d79b0b60918ad53b2089 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -38,7 +38,7 @@ from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipaplatform.paths import paths -log_file_name = paths.IPAREPLICA_CA_INSTALL_LOG +log_file_name = paths.IPASERVER_CA_INSTALL_LOG REPLICA_INFO_TOP_DIR = None def parse_options(): @@ -285,7 +285,7 @@ def main(): cainstance.is_ca_installed_locally()): sys.exit("CA is already installed on this host.") - standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug) + standard_logging_setup(log_file_name, debug=options.debug) root_logger.debug("%s was invoked with options: %s,%s", sys.argv[0], safe_options, filename) root_logger.debug("IPA version %s", version.VENDOR_VERSION) diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index d6fbe32f6839a5db40148777132ba1454cbc3382..2c221a1b48d1aa16579e9e4882f13ea6271ad1b6 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -303,7 +303,6 @@ class BasePathNamespace(object): IPABACKUP_LOG = "/var/log/ipabackup.log" IPACLIENT_INSTALL_LOG = "/var/log/ipaclient-install.log" IPACLIENT_UNINSTALL_LOG = "/var/log/ipaclient-uninstall.log" - IPAREPLICA_CA_INSTALL_LOG = "/var/log/ipareplica-ca-install.log" IPAREPLICA_CONNCHECK_LOG = "/var/log/ipareplica-conncheck.log" IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log" IPARESTORE_LOG = "/var/log/iparestore.log" -- 2.5.5
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
