More stray ncrypt reference cleanup

This commit is contained in:
Brad Warren
2016-04-14 17:04:23 -07:00
parent b956a968c6
commit 75a1d81458
10 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ MAINTAINER William Budington <bill@eff.org>
EXPOSE 443 EXPOSE 443
# TODO: make sure --config-dir and --work-dir cannot be changed # TODO: make sure --config-dir and --work-dir cannot be changed
# through the CLI (letsencrypt-docker wrapper that uses standalone # through the CLI (certbot-docker wrapper that uses standalone
# authenticator and text mode only?) # authenticator and text mode only?)
VOLUME /etc/letsencrypt /var/lib/letsencrypt VOLUME /etc/letsencrypt /var/lib/letsencrypt
+1 -1
View File
@@ -9,7 +9,7 @@ MAINTAINER Yan <yan@eff.org>
EXPOSE 443 EXPOSE 443
# TODO: make sure --config-dir and --work-dir cannot be changed # TODO: make sure --config-dir and --work-dir cannot be changed
# through the CLI (letsencrypt-docker wrapper that uses standalone # through the CLI (certbot-docker wrapper that uses standalone
# authenticator and text mode only?) # authenticator and text mode only?)
VOLUME /etc/letsencrypt /var/lib/letsencrypt VOLUME /etc/letsencrypt /var/lib/letsencrypt
+1 -1
View File
@@ -1,4 +1,4 @@
Let's Encrypt Python Client Certbot ACME Client
Copyright (c) Electronic Frontier Foundation and others Copyright (c) Electronic Frontier Foundation and others
Licensed Apache Version 2.0 Licensed Apache Version 2.0
@@ -1083,7 +1083,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"redirection") "redirection")
self._create_redirect_vhost(ssl_vhost) self._create_redirect_vhost(ssl_vhost)
else: else:
# Check if LetsEncrypt redirection already exists # Check if Certbot redirection already exists
self._verify_no_certbot_redirect(general_vh) self._verify_no_certbot_redirect(general_vh)
# Note: if code flow gets here it means we didn't find the exact # Note: if code flow gets here it means we didn't find the exact
@@ -1125,7 +1125,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"""Checks to see if a redirect was already installed by certbot. """Checks to see if a redirect was already installed by certbot.
Checks to see if virtualhost already contains a rewrite rule that is Checks to see if virtualhost already contains a rewrite rule that is
identical to Letsencrypt's redirection rewrite rule. identical to Certbot's redirection rewrite rule.
:param vhost: vhost to check :param vhost: vhost to check
:type vhost: :class:`~certbot_apache.obj.VirtualHost` :type vhost: :class:`~certbot_apache.obj.VirtualHost`
+2 -2
View File
@@ -67,7 +67,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'certbot-apache' project = u'certbot-apache'
copyright = u'2014-2015, Let\'s Encrypt Project' copyright = u'2014-2015, Let\'s Encrypt Project'
author = u'Let\'s Encrypt Project' author = u'Certbot Project'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
@@ -250,7 +250,7 @@ latex_elements = {
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
(master_doc, 'certbot-apache.tex', u'certbot-apache Documentation', (master_doc, 'certbot-apache.tex', u'certbot-apache Documentation',
u'Let\'s Encrypt Project', 'manual'), u'Certbot Project', 'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
@@ -1,4 +1,4 @@
"""Utility functions for Let"s Encrypt plugin tests.""" """Utility functions for Certbot plugin tests."""
import argparse import argparse
import copy import copy
import contextlib import contextlib
+2 -2
View File
@@ -61,7 +61,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'certbot-compatibility-test' project = u'certbot-compatibility-test'
copyright = u'2014-2015, Let\'s Encrypt Project' copyright = u'2014-2015, Let\'s Encrypt Project'
author = u'Let\'s Encrypt Project' author = u'Certbot Project'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
@@ -245,7 +245,7 @@ latex_elements = {
latex_documents = [ latex_documents = [
(master_doc, 'certbot-compatibility-test.tex', (master_doc, 'certbot-compatibility-test.tex',
u'certbot-compatibility-test Documentation', u'certbot-compatibility-test Documentation',
u'Let\'s Encrypt Project', 'manual'), u'Certbot Project', 'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
+1 -1
View File
@@ -51,7 +51,7 @@ def _determine_user_agent(config):
""" """
if config.user_agent is None: if config.user_agent is None:
ua = "LetsEncryptPythonClient/{0} ({1}) Authenticator/{2} Installer/{3}" ua = "CertbotACMEClient/{0} ({1}) Authenticator/{2} Installer/{3}"
ua = ua.format(certbot.__version__, " ".join(le_util.get_os_info()), ua = ua.format(certbot.__version__, " ".join(le_util.get_os_info()),
config.authenticator, config.installer) config.authenticator, config.installer)
else: else:
+2 -2
View File
@@ -60,7 +60,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'letshelp-certbot' project = u'letshelp-certbot'
copyright = u'2014-2015, Let\'s Encrypt Project' copyright = u'2014-2015, Let\'s Encrypt Project'
author = u'Let\'s Encrypt Project' author = u'Certbot Project'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
@@ -243,7 +243,7 @@ latex_elements = {
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
(master_doc, 'letshelp-certbot.tex', u'letshelp-certbot Documentation', (master_doc, 'letshelp-certbot.tex', u'letshelp-certbot Documentation',
u'Let\'s Encrypt Project', 'manual'), u'Certbot Project', 'manual'),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
+1 -1
View File
@@ -4,7 +4,7 @@
# instance (see ./boulder-start.sh). # instance (see ./boulder-start.sh).
# #
# Environment variables: # Environment variables:
# SERVER: Passed as "letsencrypt --server" argument. # SERVER: Passed as "certbot --server" argument.
# #
# Note: this script is called by Boulder integration test suite! # Note: this script is called by Boulder integration test suite!