PATCH 0056 just fixes a typo in ipaplatform/paths

PATCH 0057 addresses
https://fedorahosted.org/freeipa/ticket/5159


--
Martin^3 Babinsky
From 9835537bdf46305177bba949f9f87313a6dd337e Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Thu, 13 Aug 2015 15:05:36 +0200
Subject: [PATCH 2/2] ipa-backup: archive DNSSEC zone file and kasp.db

https://fedorahosted.org/freeipa/ticket/5159
---
 ipaserver/install/ipa_backup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 2af2af902dfd77629b589e5ef6cd2a93edecd6ac..ac8f03beb79ebb323e46aa669bab2e24634a744c 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -171,6 +171,8 @@ class Backup(admintool.AdminTool):
         paths.SVC_LIST_FILE,
         paths.OPENDNSSEC_CONF_FILE,
         paths.OPENDNSSEC_KASP_FILE,
+        paths.OPENDNSSEC_ZONELIST_FILE,
+        paths.OPENDNSSEC_KASP_DB,
         paths.DNSSEC_SOFTHSM2_CONF,
         paths.DNSSEC_SOFTHSM_PIN_SO,
         paths.IPA_ODS_EXPORTER_KEYTAB,
-- 
2.4.3

From 7c77c1aca6e34acd11ba1efdfeda02266596116c Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Thu, 13 Aug 2015 15:03:05 +0200
Subject: [PATCH 1/2] fix typo in BasePathNamespace member pointing to ods
 exporter config

---
 ipaplatform/base/paths.py                | 2 +-
 ipaserver/install/ipa_backup.py          | 2 +-
 ipaserver/install/odsexporterinstance.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index 4c93c1f7162b0aeb4f798ef84e1ac8db4573518b..0dd3c7fda3020264a1ace8f2d13557cfddf18c2d 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -119,7 +119,7 @@ class BasePathNamespace(object):
     SYSCONFIG_DIRSRV_PKI_IPA_DIR = "/etc/sysconfig/dirsrv-PKI-IPA"
     SYSCONFIG_DIRSRV_SYSTEMD = "/etc/sysconfig/dirsrv.systemd"
     SYSCONFIG_IPA_DNSKEYSYNCD = "/etc/sysconfig/ipa-dnskeysyncd"
-    SYSOCNFIG_IPA_ODS_EXPORTER = "/etc/sysconfig/ipa-ods-exporter"
+    SYSCONFIG_IPA_ODS_EXPORTER = "/etc/sysconfig/ipa-ods-exporter"
     SYSCONFIG_HTTPD = "/etc/sysconfig/httpd"
     SYSCONFIG_KRB5KDC_DIR = "/etc/sysconfig/krb5kdc"
     SYSCONFIG_NAMED = "/etc/sysconfig/named"
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 685c618d8e7b9dcf26e71b99159769ca2b973e7e..2af2af902dfd77629b589e5ef6cd2a93edecd6ac 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -132,7 +132,7 @@ class Backup(admintool.AdminTool):
         paths.SYSCONFIG_KRB5KDC_DIR,
         paths.SYSCONFIG_PKI_CA_PKI_CA_DIR,
         paths.SYSCONFIG_IPA_DNSKEYSYNCD,
-        paths.SYSOCNFIG_IPA_ODS_EXPORTER,
+        paths.SYSCONFIG_IPA_ODS_EXPORTER,
         paths.SYSCONFIG_NAMED,
         paths.SYSCONFIG_ODS,
         paths.ETC_SYSCONFIG_AUTHCONFIG,
diff --git a/ipaserver/install/odsexporterinstance.py b/ipaserver/install/odsexporterinstance.py
index 51b0f3efc55c4cd86ca451ccc83f88d6562b451e..dd5a92ebd9488d63220684921a3c897e543f237f 100644
--- a/ipaserver/install/odsexporterinstance.py
+++ b/ipaserver/install/odsexporterinstance.py
@@ -86,7 +86,7 @@ class ODSExporterInstance(service.Service):
             root_logger.error("DNSKeyExporter service already exists")
 
     def __setup_key_exporter(self):
-        installutils.set_directive(paths.SYSOCNFIG_IPA_ODS_EXPORTER,
+        installutils.set_directive(paths.SYSCONFIG_IPA_ODS_EXPORTER,
                                    'SOFTHSM2_CONF',
                                    paths.DNSSEC_SOFTHSM2_CONF,
                                    quotes=False, separator='=')
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to