starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 08:03:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

change verify_no_redirects to verify_no_letsencrypt_redirect

Browse Source
This commit is contained in:
sagi
2015-12-02 00:34:15 +00:00
parent fdd9cf7610
commit 5d0337bdf2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+5 -9
View File
@@ -878,7 +878,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self._create_redirect_vhost(ssl_vhost) self._create_redirect_vhost(ssl_vhost)
else: else:
# Check if LetsEncrypt redirection already exists # Check if LetsEncrypt redirection already exists
self._verify_no_redirects(general_vh) self._verify_no_letsencrypt_redirect(general_vh)
# Add directives to server # Add directives to server
# Note: These are not immediately searchable in sites-enabled # Note: These are not immediately searchable in sites-enabled
@@ -893,21 +893,17 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
logger.info("Redirecting vhost in %s to ssl vhost in %s", logger.info("Redirecting vhost in %s to ssl vhost in %s",
general_vh.filep, ssl_vhost.filep) general_vh.filep, ssl_vhost.filep)
def _verify_no_redirects(self, vhost): def _verify_no_letsencrypt_redirect(self, vhost):
"""Checks to see if existing redirect is in place. """Checks to see if a redirect was already installed by letsencrypt.
Checks to see if virtualhost already contains a rewrite or redirect Checks to see if virtualhost already contains a rewrite rule that is
returns boolean, integer identical to Letsencrypt's redirection rewrite rule.
:param vhost: vhost to check :param vhost: vhost to check
:type vhost: :class:`~letsencrypt_apache.obj.VirtualHost` :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
:raises errors.PluginEnhancementAlreadyPresent: When the exact :raises errors.PluginEnhancementAlreadyPresent: When the exact
letsencrypt redirection WriteRule exists in virtual host. letsencrypt redirection WriteRule exists in virtual host.
errors.PluginError: When there exists directives that may hint
other redirection. (TODO: We should not throw a PluginError,
but that's for an other PR.)
""" """
rewrite_path = self.parser.find_dir( rewrite_path = self.parser.find_dir(
"RewriteRule", None, start=vhost.path) "RewriteRule", None, start=vhost.path)