summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/ipa_backup.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-10-01 13:13:12 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-10-02 13:53:55 +0200
commitcc085d1d4cc03d4f8ad3b2742d8038d818893cc4 (patch)
treef818116e8aaf414abf1134ae892579ffcf985abd /ipaserver/install/ipa_backup.py
parent21276e8a3fa1028fd9e227151cd20bfd80713810 (diff)
downloadfreeipa-cc085d1d4cc03d4f8ad3b2742d8038d818893cc4.tar.gz
freeipa-cc085d1d4cc03d4f8ad3b2742d8038d818893cc4.tar.xz
freeipa-cc085d1d4cc03d4f8ad3b2742d8038d818893cc4.zip
backup/restore: Add files from /etc/ipa/nssdb
Add files from /etc/ipa/nssdb (IPA_NSSDB_DIR), which now used instead of /etc/pki/nssdb (NSS_DB_DIR). The old location is still supported. https://fedorahosted.org/freeipa/ticket/4597 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install/ipa_backup.py')
-rw-r--r--ipaserver/install/ipa_backup.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 2baa5dde0..ded02171c 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -132,9 +132,7 @@ class Backup(admintool.AdminTool):
paths.SYSCONFIG_KRB5KDC_DIR,
paths.SYSCONFIG_PKI_CA_PKI_CA_DIR,
paths.ETC_SYSCONFIG_AUTHCONFIG,
- paths.NSSDB_CERT8_DB,
- paths.NSSDB_KEY3_DB,
- paths.NSSDB_SECMOD_DB,
+ paths.IPA_NSSDB_PWDFILE_TXT,
paths.NSSWITCH_CONF,
paths.KRB5_KEYTAB,
paths.SSSD_CONF,
@@ -163,6 +161,10 @@ class Backup(admintool.AdminTool):
paths.SYSTEMD_CERTMONGER_SERVICE,
paths.SYSTEMD_PKI_TOMCAT_SERVICE,
paths.SVC_LIST_FILE,
+ ) + tuple(
+ os.path.join(base, file)
+ for base in (paths.NSS_DB_DIR, paths.IPA_NSSDB_DIR)
+ for file in ('cert8.db', 'key3.db', 'secmod.db')
)
logs=(