From 3789922c0b00213f60f6d1c87b2ae24e7bfdb531 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Tue, 23 Jun 2015 11:16:36 +0000
Subject: [PATCH] Move AugeasConfigurator to letsencrypt_apache.

https://github.com/letsencrypt/lets-encrypt-preview/pull/531#issuecomment-114285541
---
 docs/api/augeas_configurator.rst                           | 5 -----
 docs/pkgs/letsencrypt_apache.rst                           | 7 +++++++
 {letsencrypt => letsencrypt_apache}/augeas_configurator.py | 0
 letsencrypt_apache/configurator.py                         | 2 +-
 setup.py                                                   | 1 -
 5 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 docs/api/augeas_configurator.rst
 rename {letsencrypt => letsencrypt_apache}/augeas_configurator.py (100%)

diff --git a/docs/api/augeas_configurator.rst b/docs/api/augeas_configurator.rst
deleted file mode 100644
index 402eee797..000000000
--- a/docs/api/augeas_configurator.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-:mod:`letsencrypt.augeas_configurator`
---------------------------------------
-
-.. automodule:: letsencrypt.augeas_configurator
-   :members:
diff --git a/docs/pkgs/letsencrypt_apache.rst b/docs/pkgs/letsencrypt_apache.rst
index 44966cca6..f78caa971 100644
--- a/docs/pkgs/letsencrypt_apache.rst
+++ b/docs/pkgs/letsencrypt_apache.rst
@@ -27,3 +27,10 @@
 
 .. automodule:: letsencrypt_apache.parser
    :members:
+
+
+:mod:`letsencrypt_apache.augeas_configurator`
+=============================================
+
+.. automodule:: letsencrypt_apache.augeas_configurator
+   :members:
diff --git a/letsencrypt/augeas_configurator.py b/letsencrypt_apache/augeas_configurator.py
similarity index 100%
rename from letsencrypt/augeas_configurator.py
rename to letsencrypt_apache/augeas_configurator.py
diff --git a/letsencrypt_apache/configurator.py b/letsencrypt_apache/configurator.py
index ee522d781..fd81be636 100644
--- a/letsencrypt_apache/configurator.py
+++ b/letsencrypt_apache/configurator.py
@@ -12,7 +12,6 @@ import zope.interface
 from acme import challenges
 
 from letsencrypt import achallenges
-from letsencrypt import augeas_configurator
 from letsencrypt import constants as core_constants
 from letsencrypt import errors
 from letsencrypt import interfaces
@@ -20,6 +19,7 @@ from letsencrypt import le_util
 
 from letsencrypt.plugins import common
 
+from letsencrypt_apache import augeas_configurator
 from letsencrypt_apache import constants
 from letsencrypt_apache import dvsni
 from letsencrypt_apache import obj
diff --git a/setup.py b/setup.py
index ef819f50b..e2dd6f88e 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,6 @@ letsencrypt_install_requires = [
     # https://pyopenssl.readthedocs.org/en/latest/api/crypto.html#OpenSSL.crypto.X509Req.get_extensions
     'PyOpenSSL>=0.15',
     'pyrfc3339',
-    'python-augeas',
     'python2-pythondialog>=3.2.2rc1',  # Debian squeeze support, cf. #280
     'pytz',
     'requests',