From 3c00afd55c1c5f06ee2400f3b8980ebcbe553dea Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Tue, 10 Nov 2015 16:31:52 -0800
Subject: [PATCH] Revert "Removed revert_challenge_config"

This reverts commit 0143d773628fb5d91228eca9f16f8543755b029a.
---
 .../letsencrypt_apache/augeas_configurator.py      | 12 ++++++++++++
 .../tests/augeas_configurator_test.py              | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py b/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py
index c47981252..9e0948f12 100644
--- a/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py
+++ b/letsencrypt-apache/letsencrypt_apache/augeas_configurator.py
@@ -164,6 +164,18 @@ class AugeasConfigurator(common.Plugin):
         # Need to reload configuration after these changes take effect
         self.aug.load()
 
+    def revert_challenge_config(self):
+        """Used to cleanup challenge configurations.
+
+        :raises .errors.PluginError: If unable to revert the challenge config.
+
+        """
+        try:
+            self.reverter.revert_temporary_config()
+        except errors.ReverterError as err:
+            raise errors.PluginError(str(err))
+        self.aug.load()
+
     def rollback_checkpoints(self, rollback=1):
         """Rollback saved checkpoints.
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py b/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py
index afa36ba77..815e6fc44 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py
+++ b/letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py
@@ -76,6 +76,20 @@ class AugeasConfiguratorTest(util.ApacheTest):
         self.assertRaises(
             errors.PluginError, self.config.recovery_routine)
 
+    def test_revert_challenge_config(self):
+        mock_load = mock.Mock()
+        self.config.aug.load = mock_load
+
+        self.config.revert_challenge_config()
+        self.assertEqual(mock_load.call_count, 1)
+
+    def test_revert_challenge_config_error(self):
+        self.config.reverter.revert_temporary_config = mock.Mock(
+            side_effect=errors.ReverterError)
+
+        self.assertRaises(
+            errors.PluginError, self.config.revert_challenge_config)
+
     def test_rollback_checkpoints(self):
         mock_load = mock.Mock()
         self.config.aug.load = mock_load