IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 15:55:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use separate install logs for AD and DNS instance

Browse Source 
ipa-dns-install and ipa-adtrust-install no longer overwrite
ipaserver-install.log. Instead they use a separate log file.

Add AD-Trust, DNS, KRA, and replica log files to backups.

Fixes: https://pagure.io/freeipa/issue/8528
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
Christian Heimes
2020-10-06 15:35:35 +02:00
parent 942fe07eb5
commit 6860c63760
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/tools/ipa-adtrust-install.in
+1 -1
View File
@@ -50,7 +50,7 @@ if six.PY3:
logger = logging.getLogger(os.path.basename(__file__)) logger = logging.getLogger(os.path.basename(__file__))
log_file_name = paths.IPASERVER_INSTALL_LOG log_file_name = paths.IPASERVER_ADTRUST_INSTALL_LOG
def parse_options(): def parse_options():
install/tools/ipa-dns-install.in
+1 -1
View File
@@ -38,7 +38,7 @@ from ipaserver.install import dns as dns_installer
logger = logging.getLogger(os.path.basename(__file__)) logger = logging.getLogger(os.path.basename(__file__))
log_file_name = paths.IPASERVER_INSTALL_LOG log_file_name = paths.IPASERVER_DNS_INSTALL_LOG
def parse_options(): def parse_options():
parser = IPAOptionParser(version=version.VERSION) parser = IPAOptionParser(version=version.VERSION)
ipaplatform/base/paths.py
+2
View File
@@ -351,6 +351,8 @@ class BasePathNamespace:
IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log" IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log"
IPARESTORE_LOG = "/var/log/iparestore.log" IPARESTORE_LOG = "/var/log/iparestore.log"
IPASERVER_INSTALL_LOG = "/var/log/ipaserver-install.log" IPASERVER_INSTALL_LOG = "/var/log/ipaserver-install.log"
IPASERVER_ADTRUST_INSTALL_LOG = "/var/log/ipaserver-adtrust-install.log"
IPASERVER_DNS_INSTALL_LOG = "/var/log/ipaserver-dns-install.log"
IPASERVER_KRA_INSTALL_LOG = "/var/log/ipaserver-kra-install.log" IPASERVER_KRA_INSTALL_LOG = "/var/log/ipaserver-kra-install.log"
IPASERVER_UNINSTALL_LOG = "/var/log/ipaserver-uninstall.log" IPASERVER_UNINSTALL_LOG = "/var/log/ipaserver-uninstall.log"
IPAUPGRADE_LOG = "/var/log/ipaupgrade.log" IPAUPGRADE_LOG = "/var/log/ipaupgrade.log"
ipaserver/install/ipa_backup.py
+6
View File
@@ -205,6 +205,12 @@ class Backup(admintool.AdminTool):
paths.VAR_LOG_PKI_DIR, paths.VAR_LOG_PKI_DIR,
paths.VAR_LOG_HTTPD_DIR, paths.VAR_LOG_HTTPD_DIR,
paths.IPASERVER_INSTALL_LOG, paths.IPASERVER_INSTALL_LOG,
paths.IPASERVER_ADTRUST_INSTALL_LOG,
paths.IPASERVER_DNS_INSTALL_LOG,
paths.IPASERVER_KRA_INSTALL_LOG,
paths.IPAREPLICA_INSTALL_LOG,
paths.IPAREPLICA_CONNCHECK_LOG,
paths.IPAREPLICA_CA_INSTALL_LOG,
paths.KADMIND_LOG, paths.KADMIND_LOG,
paths.MESSAGES, paths.MESSAGES,
paths.IPACLIENT_INSTALL_LOG, paths.IPACLIENT_INSTALL_LOG,
ipatests/pytest_ipa/integration/__init__.py
+3 -1
View File
@@ -45,11 +45,13 @@ CLASS_LOGFILES = [
paths.VAR_LOG_DIRSRV, paths.VAR_LOG_DIRSRV,
# IPA install logs # IPA install logs
paths.IPASERVER_INSTALL_LOG, paths.IPASERVER_INSTALL_LOG,
paths.IPASERVER_ADTRUST_INSTALL_LOG,
paths.IPASERVER_DNS_INSTALL_LOG,
paths.IPASERVER_KRA_INSTALL_LOG,
paths.IPACLIENT_INSTALL_LOG, paths.IPACLIENT_INSTALL_LOG,
paths.IPAREPLICA_INSTALL_LOG, paths.IPAREPLICA_INSTALL_LOG,
paths.IPAREPLICA_CONNCHECK_LOG, paths.IPAREPLICA_CONNCHECK_LOG,
paths.IPAREPLICA_CA_INSTALL_LOG, paths.IPAREPLICA_CA_INSTALL_LOG,
paths.IPASERVER_KRA_INSTALL_LOG,
paths.IPA_CUSTODIA_AUDIT_LOG, paths.IPA_CUSTODIA_AUDIT_LOG,
paths.IPACLIENTSAMBA_INSTALL_LOG, paths.IPACLIENTSAMBA_INSTALL_LOG,
paths.IPACLIENTSAMBA_UNINSTALL_LOG, paths.IPACLIENTSAMBA_UNINSTALL_LOG,