|
 |
ac7d03 |
From 7b57dd770bbb4861f46805adaa9597445dff142c Mon Sep 17 00:00:00 2001
|
|
|
ac7d03 |
From: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
ac7d03 |
Date: Thu, 16 Mar 2017 10:22:59 +0100
|
|
|
ac7d03 |
Subject: [PATCH] Backup ipa-specific httpd unit-file
|
|
|
ac7d03 |
|
|
|
ac7d03 |
On backup-restore, the ipa unit file for httpd was not backed up.
|
|
|
ac7d03 |
This file however contains setting for httpd to communicate with
|
|
|
ac7d03 |
gssproxy so not backing it up will result in httpd not knowing
|
|
|
ac7d03 |
how to get credentials.
|
|
|
ac7d03 |
|
|
|
ac7d03 |
https://pagure.io/freeipa/issue/6748
|
|
|
ac7d03 |
|
|
|
ac7d03 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
ac7d03 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
ac7d03 |
---
|
|
|
ac7d03 |
ipaserver/install/ipa_backup.py | 1 +
|
|
|
ac7d03 |
ipaserver/install/ipa_restore.py | 2 ++
|
|
|
ac7d03 |
2 files changed, 3 insertions(+)
|
|
|
ac7d03 |
|
|
|
ac7d03 |
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
|
|
|
ac7d03 |
index 07c50c8364c313b9aeb6d73540b541f55d98a44d..56583c01b1677a48c103d79123e3fbe106222f38 100644
|
|
|
ac7d03 |
--- a/ipaserver/install/ipa_backup.py
|
|
|
ac7d03 |
+++ b/ipaserver/install/ipa_backup.py
|
|
|
ac7d03 |
@@ -166,6 +166,7 @@ class Backup(admintool.AdminTool):
|
|
|
ac7d03 |
paths.KDC_CERT,
|
|
|
ac7d03 |
paths.KDC_KEY,
|
|
|
ac7d03 |
paths.SYSTEMD_IPA_SERVICE,
|
|
|
ac7d03 |
+ paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF,
|
|
|
ac7d03 |
paths.SYSTEMD_SSSD_SERVICE,
|
|
|
ac7d03 |
paths.SYSTEMD_CERTMONGER_SERVICE,
|
|
|
ac7d03 |
paths.SYSTEMD_PKI_TOMCAT_SERVICE,
|
|
|
ac7d03 |
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
|
|
|
ac7d03 |
index d798654ea7464f66e461936e41e3747a16acb21d..2552bbdef36f653f1c377ea096ca227d09e5f3e6 100644
|
|
|
ac7d03 |
--- a/ipaserver/install/ipa_restore.py
|
|
|
ac7d03 |
+++ b/ipaserver/install/ipa_restore.py
|
|
|
ac7d03 |
@@ -414,6 +414,8 @@ class Restore(admintool.AdminTool):
|
|
|
ac7d03 |
sssd = services.service('sssd', api)
|
|
|
ac7d03 |
sssd.restart()
|
|
|
ac7d03 |
http.remove_httpd_ccaches()
|
|
|
ac7d03 |
+ # have the daemons pick up their restored configs
|
|
|
ac7d03 |
+ run([paths.SYSTEMCTL, "--system", "daemon-reload"])
|
|
|
ac7d03 |
finally:
|
|
|
ac7d03 |
try:
|
|
|
ac7d03 |
os.chdir(cwd)
|
|
|
ac7d03 |
--
|
|
|
ac7d03 |
2.12.1
|
|
|
ac7d03 |
|