IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

backup/restore: Add files from /etc/ipa/nssdb

Browse Source 
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>
This commit is contained in:
Petr Viktorin 2014-10-01 13:13:12 +02:00
parent 21276e8a3f
commit cc085d1d4c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipaplatform/base/paths.py
View File

@ -64,6 +64,7 @@ class BasePathNamespace(object):
IPA_CA_CRT = "/etc/ipa/ca.crt" IPA_CA_CRT = "/etc/ipa/ca.crt"
IPA_DEFAULT_CONF = "/etc/ipa/default.conf" IPA_DEFAULT_CONF = "/etc/ipa/default.conf"
IPA_NSSDB_DIR = "/etc/ipa/nssdb" IPA_NSSDB_DIR = "/etc/ipa/nssdb"
IPA_NSSDB_PWDFILE_TXT = "/etc/ipa/nssdb/pwdfile.txt"
KRB5_CONF = "/etc/krb5.conf" KRB5_CONF = "/etc/krb5.conf"
KRB5_KEYTAB = "/etc/krb5.keytab" KRB5_KEYTAB = "/etc/krb5.keytab"
LDAP_CONF = "/etc/ldap.conf" LDAP_CONF = "/etc/ldap.conf"
@ -83,9 +84,6 @@ class BasePathNamespace(object):
SYSTEMWIDE_CA_STORE = "/etc/pki/ca-trust/source/anchors/" SYSTEMWIDE_CA_STORE = "/etc/pki/ca-trust/source/anchors/"
IPA_P11_KIT = "/etc/pki/ca-trust/source/ipa.p11-kit" IPA_P11_KIT = "/etc/pki/ca-trust/source/ipa.p11-kit"
NSS_DB_DIR = "/etc/pki/nssdb" 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 = "/etc/pki/pki-tomcat"
PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/" PKI_TOMCAT_ALIAS_DIR = "/etc/pki/pki-tomcat/alias/"
PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf" PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf"

8
ipaserver/install/ipa_backup.py
View File

@ -132,9 +132,7 @@ class Backup(admintool.AdminTool):
paths.SYSCONFIG_KRB5KDC_DIR, paths.SYSCONFIG_KRB5KDC_DIR,
paths.SYSCONFIG_PKI_CA_PKI_CA_DIR, paths.SYSCONFIG_PKI_CA_PKI_CA_DIR,
paths.ETC_SYSCONFIG_AUTHCONFIG, paths.ETC_SYSCONFIG_AUTHCONFIG,
paths.NSSDB_CERT8_DB, paths.IPA_NSSDB_PWDFILE_TXT,
paths.NSSDB_KEY3_DB,
paths.NSSDB_SECMOD_DB,
paths.NSSWITCH_CONF, paths.NSSWITCH_CONF,
paths.KRB5_KEYTAB, paths.KRB5_KEYTAB,
paths.SSSD_CONF, paths.SSSD_CONF,
@ -163,6 +161,10 @@ class Backup(admintool.AdminTool):
paths.SYSTEMD_CERTMONGER_SERVICE, paths.SYSTEMD_CERTMONGER_SERVICE,
paths.SYSTEMD_PKI_TOMCAT_SERVICE, paths.SYSTEMD_PKI_TOMCAT_SERVICE,
paths.SVC_LIST_FILE, 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=( logs=(