Merge branch 'master' into fix-apache-conf-test

Dockerfile

@@ -10,7 +10,7 @@ MAINTAINER William Budington <bill@eff.org>
 EXPOSE 443
 
 # 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?)
 VOLUME /etc/letsencrypt /var/lib/letsencrypt
 

Dockerfile-dev

@@ -9,7 +9,7 @@ MAINTAINER Yan <yan@eff.org>
 EXPOSE 443
 
 # 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?)
 VOLUME /etc/letsencrypt /var/lib/letsencrypt
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Let's Encrypt Python Client
+Certbot ACME Client
 Copyright (c) Electronic Frontier Foundation and others
 Licensed Apache Version 2.0
 

acme/setup.py

@@ -53,7 +53,7 @@ setup(
     version=version,
     description='ACME protocol implementation in Python',
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

certbot-apache/certbot_apache/configurator.py

@@ -1083,7 +1083,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
                         "redirection")
             self._create_redirect_vhost(ssl_vhost)
         else:
-            # Check if LetsEncrypt redirection already exists
+            # Check if Certbot redirection already exists
             self._verify_no_certbot_redirect(general_vh)
 
             # 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 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
         :type vhost: :class:`~certbot_apache.obj.VirtualHost`

certbot-apache/docs/conf.py

@@ -67,7 +67,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'certbot-apache'
 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
 # |version| and |release|, also used in various other places throughout the
@@ -250,7 +250,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (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

certbot-apache/setup.py

@@ -33,7 +33,7 @@ setup(
     version=version,
     description="Apache plugin for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

certbot-compatibility-test/certbot_compatibility_test/util.py

@@ -1,4 +1,4 @@
-"""Utility functions for Let"s Encrypt plugin tests."""
+"""Utility functions for Certbot plugin tests."""
 import argparse
 import copy
 import contextlib

certbot-compatibility-test/docs/conf.py

@@ -61,7 +61,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'certbot-compatibility-test'
 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
 # |version| and |release|, also used in various other places throughout the
@@ -245,7 +245,7 @@ latex_elements = {
 latex_documents = [
     (master_doc, 'certbot-compatibility-test.tex',
      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

certbot-compatibility-test/setup.py

@@ -35,7 +35,7 @@ setup(
     version=version,
     description="Compatibility tests for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

certbot-nginx/setup.py

@@ -33,7 +33,7 @@ setup(
     version=version,
     description="Nginx plugin for Certbot",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

certbot/client.py

@@ -51,7 +51,7 @@ def _determine_user_agent(config):
     """
 
     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()),
                        config.authenticator, config.installer)
     else:

letshelp-certbot/docs/conf.py

@@ -60,7 +60,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'letshelp-certbot'
 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
 # |version| and |release|, also used in various other places throughout the
@@ -243,7 +243,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (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

letshelp-certbot/setup.py

@@ -24,7 +24,7 @@ setup(
     version=version,
     description="Let's help Certbot client",
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

setup.cfg

@@ -3,6 +3,6 @@ zip_ok = false
 
 [nosetests]
 nocapture=1
-cover-package=letsencrypt,acme,letsencrypt_apache,letsencrypt_nginx
+cover-package=certbot,acme,certbot_apache,certbot_nginx
 cover-erase=1
 cover-tests=1

setup.py

@@ -90,7 +90,7 @@ setup(
     description="ACME client",
     long_description=readme,  # later: + '\n\n' + changes
     url='https://github.com/letsencrypt/letsencrypt',
-    author="Electronic Frontier Foundation",
+    author="Certbot Project",
     author_email='client-dev@letsencrypt.org',
     license='Apache License 2.0',
     classifiers=[

tests/boulder-integration.sh

@@ -4,7 +4,7 @@
 # instance (see ./boulder-start.sh).
 #
 # Environment variables:
-#   SERVER: Passed as "letsencrypt --server" argument.
+#   SERVER: Passed as "certbot --server" argument.
 #
 # Note: this script is called by Boulder integration test suite!
 

tests/letstest/README.md

@@ -1,10 +1,10 @@
 # letstest
-simple aws testfarm scripts for letsencrypt client testing
+simple aws testfarm scripts for certbot client testing
 
 - Configures (canned) boulder server
 - Launches EC2 instances with a given list of AMIs for different distros
-- Copies letsencrypt repo and puts it on the instances
-- Runs letsencrypt tests (bash scripts) on all of these
+- Copies certbot repo and puts it on the instances
+- Runs certbot tests (bash scripts) on all of these
 - Logs execution and success/fail for debugging
 
 ## Notes

tests/letstest/multitester.py

@@ -1,10 +1,10 @@
 """
-Letsencrypt Integration Test Tool
+Certbot Integration Test Tool
 
 - Configures (canned) boulder server
 - Launches EC2 instances with a given list of AMIs for different distros
-- Copies letsencrypt repo and puts it on the instances
-- Runs letsencrypt tests (bash scripts) on all of these
+- Copies certbot repo and puts it on the instances
+- Runs certbot tests (bash scripts) on all of these
 - Logs execution and success/fail for debugging
 
 Notes:
@@ -61,10 +61,10 @@ parser.add_argument('test_script',
 #                    required=False)
 parser.add_argument('--repo',
                     default='https://github.com/letsencrypt/letsencrypt.git',
-                    help='letsencrypt git repo to use')
+                    help='certbot git repo to use')
 parser.add_argument('--branch',
                     default='~',
-                    help='letsencrypt git branch to trial')
+                    help='certbot git branch to trial')
 parser.add_argument('--pull_request',
                     default='~',
                     help='letsencrypt/letsencrypt pull request to trial')
@@ -257,7 +257,7 @@ def local_git_PR(repo_url, PRnumstr, merge_master=True):
         local('if [ -d letsencrypt ]; then rm -rf letsencrypt; fi')
         local('git clone %s letsencrypt'% repo_url)
         local('cd letsencrypt && git fetch origin pull/%s/head:lePRtest'%PRnumstr)
-        local('cd letsencrypt && git co lePRtest')
+        local('cd letsencrypt && git checkout lePRtest')
         if merge_master:
             local('cd letsencrypt && git remote update origin')
             local('cd letsencrypt && git merge origin/master -m "testmerge"')
@@ -291,7 +291,7 @@ def config_and_launch_boulder(instance):
     execute(deploy_script, 'scripts/boulder_config.sh')
     execute(run_boulder)
 
-def install_and_launch_letsencrypt(instance, boulder_url, target):
+def install_and_launch_certbot(instance, boulder_url, target):
     execute(local_repo_to_remote)
     with shell_env(BOULDER_URL=boulder_url,
                    PUBLIC_IP=instance.public_ip_address,
@@ -301,13 +301,13 @@ def install_and_launch_letsencrypt(instance, boulder_url, target):
                    OS_TYPE=target['type']):
         execute(deploy_script, cl_args.test_script)
 
-def grab_letsencrypt_log():
+def grab_certbot_log():
     "grabs letsencrypt.log via cat into logged stdout"
     sudo('if [ -f /var/log/letsencrypt/letsencrypt.log ]; then \
     cat /var/log/letsencrypt/letsencrypt.log; else echo "[novarlog]"; fi')
     # fallback file if /var/log is unwriteable...? correct?
-    sudo('if [ -f ./letsencrypt.log ]; then \
-    cat ./letsencrypt.log; else echo "[nolocallog]"; fi')
+    sudo('if [ -f ./certbot.log ]; then \
+    cat ./certbot.log; else echo "[nolocallog]"; fi')
 
 def create_client_instances(targetlist):
     "Create a fleet of client instances"
@@ -357,10 +357,10 @@ def test_client_process(inqueue, outqueue):
             print("%s - %s FAIL"%(target['ami'], target['name']))
             pass
 
-        # append server letsencrypt.log to each per-machine output log
-        print("\n\nletsencrypt.log\n" + "-"*80 + "\n")
+        # append server certbot.log to each per-machine output log
+        print("\n\ncertbot.log\n" + "-"*80 + "\n")
         try:
-            execute(grab_letsencrypt_log)
+            execute(grab_certbot_log)
         except:
             print("log fail\n")
             pass

tests/letstest/scripts/test_apache2.sh

@@ -22,8 +22,8 @@ then
     sudo chmod -R oug+rwx /var/www
     sudo chmod -R oug+rw /etc/httpd
     sudo echo '<html><head><title>foo</title></head><body>bar</body></html>' > /var/www/$PUBLIC_HOSTNAME/public_html/index.html
-    sudo mkdir /etc/httpd/sites-available #letsencrypt requires this...
-    sudo mkdir /etc/httpd/sites-enabled #letsencrypt requires this...
+    sudo mkdir /etc/httpd/sites-available #certbot requires this...
+    sudo mkdir /etc/httpd/sites-enabled #certbot requires this...
     #sudo echo "IncludeOptional sites-enabled/*.conf" >> /etc/httpd/conf/httpd.conf
     sudo echo """
 <VirtualHost *:80>
@@ -35,7 +35,7 @@ then
     #sudo cp /etc/httpd/sites-available/$PUBLIC_HOSTNAME.conf /etc/httpd/sites-enabled/
 fi
 
-# Run letsencrypt-apache2.
+# Run certbot-apache2.
 cd letsencrypt
 
 echo "Bootstrapping dependencies..."
@@ -45,7 +45,7 @@ if [ $? -ne 0 ] ; then
 fi
 
 tools/venv.sh
-sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
+sudo venv/bin/certbot -v --debug --text --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL
 if [ $? -ne 0 ] ; then

tests/letstest/scripts/test_renew_standalone.sh

@@ -3,7 +3,7 @@
 # $OS_TYPE $PUBLIC_IP $PRIVATE_IP $PUBLIC_HOSTNAME $BOULDER_URL
 # are dynamically set at execution
 
-# run letsencrypt-apache2 via letsencrypt-auto
+# run certbot-apache2 via letsencrypt-auto
 cd letsencrypt
 
 export SUDO=sudo
@@ -19,7 +19,7 @@ else
 fi
 
 bootstrap/dev/venv.sh
-sudo venv/bin/letsencrypt certonly --debug --standalone -t --agree-dev-preview --agree-tos \
+sudo venv/bin/certbot certonly --debug --standalone -t --agree-dev-preview --agree-tos \
                    --renew-by-default --redirect --register-unsafely-without-email \
                    --domain $PUBLIC_HOSTNAME --server $BOULDER_URL -v
 if [ $? -ne 0 ] ; then
@@ -36,7 +36,7 @@ if [ $? -ne 0 ] ; then
     FAIL=1
 fi
 
-sudo venv/bin/letsencrypt renew --renew-by-default
+sudo venv/bin/certbot renew --renew-by-default
 
 if [ $? -ne 0 ] ; then
     FAIL=1