diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2016-07-15 16:25:36 +0200 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-07-21 18:37:05 +0200 |
| commit | 1b8a36d134dd320896e05809cc6b49f725eadda7 (patch) | |
| tree | 169d49d08308daaf36cb7e6475cea114a64ce13c | |
| parent | 2234a774416309a44aecb84f27e6cf4c6a1a990f (diff) | |
| download | freeipa-1b8a36d134dd320896e05809cc6b49f725eadda7.tar.gz freeipa-1b8a36d134dd320896e05809cc6b49f725eadda7.tar.xz freeipa-1b8a36d134dd320896e05809cc6b49f725eadda7.zip | |
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 ipareplica-ca-install.log
It was chosen because of backwards compatibility - ipareplica-ca-install
was more commonly used. ipaserver-ca-install.log was used only in rare
CA less -> CA installation.
https://fedorahosted.org/freeipa/ticket/6086
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
| -rwxr-xr-x | install/tools/ipa-ca-install | 2 | ||||
| -rw-r--r-- | ipaplatform/base/paths.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index ed685920c..985e7413a 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -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 d6fbe32f6..1507ac36d 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -307,7 +307,6 @@ class BasePathNamespace(object): IPAREPLICA_CONNCHECK_LOG = "/var/log/ipareplica-conncheck.log" IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log" IPARESTORE_LOG = "/var/log/iparestore.log" - IPASERVER_CA_INSTALL_LOG = "/var/log/ipaserver-ca-install.log" IPASERVER_INSTALL_LOG = "/var/log/ipaserver-install.log" IPASERVER_KRA_INSTALL_LOG = "/var/log/ipaserver-kra-install.log" IPASERVER_KRA_UNINSTALL_LOG = "/var/log/ipaserver-kra-uninstall.log" |