diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-10-01 13:13:12 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-10-02 13:53:55 +0200 |
| commit | cc085d1d4cc03d4f8ad3b2742d8038d818893cc4 (patch) | |
| tree | f818116e8aaf414abf1134ae892579ffcf985abd | |
| parent | 21276e8a3fa1028fd9e227151cd20bfd80713810 (diff) | |
| download | freeipa-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>
| -rw-r--r-- | ipaplatform/base/paths.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/ipa_backup.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 1d936016a..7d294a91e 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -64,6 +64,7 @@ class BasePathNamespace(object): IPA_CA_CRT = "/etc/ipa/ca.crt" IPA_DEFAULT_CONF = "/etc/ipa/default.conf" IPA_NSSDB_DIR = "/etc/ipa/nssdb" + IPA_NSSDB_PWDFILE_TXT = "/etc/ipa/nssdb/pwdfile.txt" KRB5_CONF = "/etc/krb5.conf" KRB5_KEYTAB = "/etc/krb5.keytab" LDAP_CONF = "/etc/ldap.conf" @@ -83,9 +84,6 @@ class BasePathNamespace(object): SYSTEMWIDE_CA_STORE = "/etc/pki/ca-trust/source/anchors/" IPA_P11_KIT = "/etc/pki/ca-trust/source/ipa.p11-kit" NSS_DB_DIR = "/etc/pki/nssdb" - NSSDB_CERT8_DB = "/etc/pki/nssdb/cert8.db" - NSSDB_KEY3_DB = "/etc/pki/nssdb/key3.db" - NSSDB_SECMOD_DB = "/etc/pki/nssdb/secmod.db" PKI_TOMCAT = "/etc/pki/pki-tomcat" PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/" PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf" 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=( |