Merge remote-tracking branch 'github/letsencrypt/master' into logging

docs/api/augeas_configurator.rst

@@ -1,5 +0,0 @@
-:mod:`letsencrypt.augeas_configurator`
---------------------------------------
-
-.. automodule:: letsencrypt.augeas_configurator
-   :members:

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:

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

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',