From 148e021ac11793d77561fd7ffd3d11ecc09d86a5 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Fri, 5 Aug 2016 17:35:49 +0200 Subject: [PATCH] ipa-backup: backup /etc/tmpfiles.d/dirsrv-.conf This file allows daemon tmpfiles.d to re-create the dirs in volatile directories like /var/run or /var/lock. Without this file Dirsrv will not start. https://fedorahosted.org/freeipa/ticket/6165 Reviewed-By: Petr Spacek --- ipaplatform/base/paths.py | 1 + ipaserver/install/ipa_backup.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index b1fedf5d7..df0a92ff4 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -134,6 +134,7 @@ class BasePathNamespace(object): SYSTEMD_IPA_SERVICE = "/etc/systemd/system/multi-user.target.wants/ipa.service" SYSTEMD_SSSD_SERVICE = "/etc/systemd/system/multi-user.target.wants/sssd.service" SYSTEMD_PKI_TOMCAT_SERVICE = "/etc/systemd/system/pki-tomcatd.target.wants/pki-tomcatd@pki-tomcat.service" + ETC_TMPFILESD_DIRSRV = "/etc/tmpfiles.d/dirsrv-%s.conf" DNSSEC_TRUSTED_KEY = "/etc/trusted-key.key" HOME_DIR = "/home" PROC_FIPS_ENABLED = "/proc/sys/crypto/fips_enabled" diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py index 18a60ecd1..9b09f4293 100644 --- a/ipaserver/install/ipa_backup.py +++ b/ipaserver/install/ipa_backup.py @@ -337,9 +337,12 @@ class Backup(admintool.AdminTool): if os.path.exists(dir): self.dirs.append(dir) - file = paths.SYSCONFIG_DIRSRV_INSTANCE % serverid - if os.path.exists(file): - self.files.append(file) + for file in ( + paths.SYSCONFIG_DIRSRV_INSTANCE % serverid, + paths.ETC_TMPFILESD_DIRSRV % serverid, + ): + if os.path.exists(file): + self.files.append(file) self.logs.append(paths.VAR_LOG_DIRSRV_INSTANCE_TEMPLATE % serverid)