From 105e774914325a42fdfc8233435ea33cba26c602 Mon Sep 17 00:00:00 2001
From: Florence Blanc-Renaud <flo@redhat.com>
Date: Mar 14 2018 11:25:04 +0000
Subject: ipa-restore: remove /etc/httpd/conf.d/nss.conf


When ipa-restore is called, it needs to delete the file
nss.conf, otherwise httpd server will try to initialize
the NSS engine and access NSSCertificateDatabase.
This is a regression introduced with the switch from NSS
to SSL.

https://pagure.io/freeipa/issue/7440

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

---

diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index bae71b0..3e84f84 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -147,7 +147,9 @@ class Restore(admintool.AdminTool):
         paths.DNSSEC_TOKENS_DIR,
     ]
 
-    FILES_TO_BE_REMOVED = []
+    FILES_TO_BE_REMOVED = [
+        paths.HTTPD_NSS_CONF,
+    ]
 
     def __init__(self, options, args):
         super(Restore, self).__init__(options, args)