diff --git a/docs/api/plugins/simplefs.rst b/docs/api/plugins/simplefs.rst deleted file mode 100644 index 7165b6aca..000000000 --- a/docs/api/plugins/simplefs.rst +++ /dev/null @@ -1,5 +0,0 @@ -:mod:`letsencrypt.plugins.simplefs` ------------------------------------ - -.. automodule:: letsencrypt.plugins.simplefs - :members: diff --git a/docs/api/plugins/webroot.rst b/docs/api/plugins/webroot.rst new file mode 100644 index 000000000..339d546a5 --- /dev/null +++ b/docs/api/plugins/webroot.rst @@ -0,0 +1,5 @@ +:mod:`letsencrypt.plugins.webroot` +---------------------------------- + +.. automodule:: letsencrypt.plugins.webroot + :members: diff --git a/letsencrypt/plugins/simplefs.py b/letsencrypt/plugins/webroot.py similarity index 96% rename from letsencrypt/plugins/simplefs.py rename to letsencrypt/plugins/webroot.py index ad83c13d7..d641855ae 100644 --- a/letsencrypt/plugins/simplefs.py +++ b/letsencrypt/plugins/webroot.py @@ -1,4 +1,4 @@ -"""SimpleFS plugin.""" +"""Webroot plugin.""" import errno import logging import os @@ -16,11 +16,11 @@ logger = logging.getLogger(__name__) class Authenticator(common.Plugin): - """SimpleFS Authenticator.""" + """Webroot Authenticator.""" zope.interface.implements(interfaces.IAuthenticator) zope.interface.classProvides(interfaces.IPluginFactory) - description = "SimpleFS Authenticator" + description = "Webroot Authenticator" MORE_INFO = """\ Authenticator plugin that performs SimpleHTTP challenge by saving diff --git a/letsencrypt/plugins/simplefs_test.py b/letsencrypt/plugins/webroot_test.py similarity index 85% rename from letsencrypt/plugins/simplefs_test.py rename to letsencrypt/plugins/webroot_test.py index f80e8b29a..abd12e152 100644 --- a/letsencrypt/plugins/simplefs_test.py +++ b/letsencrypt/plugins/webroot_test.py @@ -1,4 +1,4 @@ -"""Tests for letsencrypt.plugins.simplefs.""" +"""Tests for letsencrypt.plugins.webroot.""" import os import shutil import tempfile @@ -19,19 +19,19 @@ KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem")) class AuthenticatorTest(unittest.TestCase): - """Tests for letsencrypt.plugins.simplefs.Authenticator.""" + """Tests for letsencrypt.plugins.webroot.Authenticator.""" achall = achallenges.SimpleHTTP( challb=acme_util.SIMPLE_HTTP_P, domain=None, account_key=KEY) def setUp(self): - from letsencrypt.plugins.simplefs import Authenticator + from letsencrypt.plugins.webroot import Authenticator self.root = tempfile.mkdtemp() self.validation_path = os.path.join( self.root, ".well-known", "acme-challenge", "ZXZhR3hmQURzNnBTUmIyTEF2OUlaZjE3RHQzanV4R0orUEN0OTJ3citvQQ") - self.config = mock.MagicMock(simplefs_root=self.root) - self.auth = Authenticator(self.config, "simplefs") + self.config = mock.MagicMock(webroot_root=self.root) + self.auth = Authenticator(self.config, "webroot") self.auth.prepare() def tearDown(self): @@ -48,11 +48,11 @@ class AuthenticatorTest(unittest.TestCase): self.assertEqual(1, add.call_count) def test_prepare_bad_root(self): - self.config.simplefs_root = os.path.join(self.root, "null") + self.config.webroot_root = os.path.join(self.root, "null") self.assertRaises(errors.PluginError, self.auth.prepare) def test_prepare_missing_root(self): - self.config.simplefs_root = None + self.config.webroot_root = None self.assertRaises(errors.PluginError, self.auth.prepare) def test_prepare_full_root_exists(self): diff --git a/setup.py b/setup.py index a4897aadb..92dd39d46 100644 --- a/setup.py +++ b/setup.py @@ -119,7 +119,7 @@ setup( 'letsencrypt.plugins': [ 'manual = letsencrypt.plugins.manual:Authenticator', 'null = letsencrypt.plugins.null:Installer', - 'simplefs = letsencrypt.plugins.simplefs:Authenticator', + 'webroot = letsencrypt.plugins.webroot:Authenticator', 'standalone = letsencrypt.plugins.standalone.authenticator' ':StandaloneAuthenticator', ],