Rename misc files

.gitignore

@@ -8,6 +8,7 @@ dist*/
 /.tox/
 /releases/
 letsencrypt.log
+certbot.log
 letsencrypt-auto-source/letsencrypt-auto.sig.lzma.base64
 
 # coverage

.travis.yml

@@ -82,7 +82,7 @@ sudo: false
 
 addons:
   # Custom /etc/hosts required for simple verification of http-01
-  # and tls-sni-01, and for letsencrypt_test_nginx
+  # and tls-sni-01, and for certbot_test_nginx
   hosts:
     - le.wtf
     - le1.wtf
@@ -105,7 +105,7 @@ addons:
     - libssl-dev
     - libffi-dev
     - ca-certificates
-    # For letsencrypt-nginx integration testing
+    # For certbot-nginx integration testing
     - nginx-light
     - openssl
     # For Boulder integration testing

Dockerfile

@@ -14,7 +14,7 @@ EXPOSE 443
 # authenticator and text mode only?)
 VOLUME /etc/letsencrypt /var/lib/letsencrypt
 
-WORKDIR /opt/letsencrypt
+WORKDIR /opt/certbot
 
 # no need to mkdir anything:
 # https://docs.docker.com/reference/builder/#copy
@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 # directories in its path.
 
 
-COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto
-RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/certbot/src/letsencrypt-auto-source/letsencrypt-auto
+RUN /opt/certbot/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \
@@ -33,7 +33,7 @@ RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-
 # Dockerfile we make sure we cache as much as possible
 
 
-COPY setup.py README.rst CHANGES.rst MANIFEST.in letsencrypt-auto-source/pieces/pipstrap.py /opt/letsencrypt/src/
+COPY setup.py README.rst CHANGES.rst MANIFEST.in letsencrypt-auto-source/pieces/pipstrap.py /opt/certbot/src/
 
 # all above files are necessary for setup.py and venv setup, however,
 # package source code directory has to be copied separately to a
@@ -44,26 +44,26 @@ COPY setup.py README.rst CHANGES.rst MANIFEST.in letsencrypt-auto-source/pieces/
 # copied, just its contents." Order again matters, three files are far
 # more likely to be cached than the whole project directory
 
-COPY letsencrypt /opt/letsencrypt/src/letsencrypt/
-COPY acme /opt/letsencrypt/src/acme/
-COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
-COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
+COPY certbot /opt/certbot/src/certbot/
+COPY acme /opt/certbot/src/acme/
+COPY certbot-apache /opt/certbot/src/certbot-apache/
+COPY certbot-nginx /opt/certbot/src/certbot-nginx/
 
 
-RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv
+RUN virtualenv --no-site-packages -p python2 /opt/certbot/venv
 
 # PATH is set now so pipstrap upgrades the correct (v)env
-ENV PATH /opt/letsencrypt/venv/bin:$PATH
-RUN /opt/letsencrypt/venv/bin/python /opt/letsencrypt/src/pipstrap.py && \
-    /opt/letsencrypt/venv/bin/pip install \
-    -e /opt/letsencrypt/src/acme \
-    -e /opt/letsencrypt/src \
-    -e /opt/letsencrypt/src/letsencrypt-apache \
-    -e /opt/letsencrypt/src/letsencrypt-nginx
+ENV PATH /opt/certbot/venv/bin:$PATH
+RUN /opt/certbot/venv/bin/python /opt/certbot/src/pipstrap.py && \
+    /opt/certbot/venv/bin/pip install \
+    -e /opt/certbot/src/acme \
+    -e /opt/certbot/src \
+    -e /opt/certbot/src/certbot-apache \
+    -e /opt/certbot/src/certbot-nginx
 
 # install in editable mode (-e) to save space: it's not possible to
-# "rm -rf /opt/letsencrypt/src" (it's stays in the underlaying image);
+# "rm -rf /opt/certbot/src" (it's stays in the underlaying image);
 # this might also help in debugging: you can "docker run --entrypoint
 # bash" and investigate, apply patches, etc.
 
-ENTRYPOINT [ "letsencrypt" ]
+ENTRYPOINT [ "certbot" ]

Dockerfile-dev

@@ -13,7 +13,7 @@ EXPOSE 443
 # authenticator and text mode only?)
 VOLUME /etc/letsencrypt /var/lib/letsencrypt
 
-WORKDIR /opt/letsencrypt
+WORKDIR /opt/certbot
 
 # no need to mkdir anything:
 # https://docs.docker.com/reference/builder/#copy
@@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt
 
 # TODO: Install non-default Python versions for tox.
 # TODO: Install Apache/Nginx for plugin development.
-COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto
-RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/certbot/src/letsencrypt-auto-source/letsencrypt-auto
+RUN /opt/certbot/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
            /tmp/* \
@@ -32,7 +32,7 @@ RUN /opt/letsencrypt/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-
 # the above is not likely to change, so by putting it further up the
 # Dockerfile we make sure we cache as much as possible
 
-COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
+COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/certbot/src/
 
 # all above files are necessary for setup.py, however, package source
 # code directory has to be copied separately to a subdirectory...
@@ -42,27 +42,27 @@ COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh t
 # copied, just its contents." Order again matters, three files are far
 # more likely to be cached than the whole project directory
 
-COPY letsencrypt /opt/letsencrypt/src/letsencrypt/
-COPY acme /opt/letsencrypt/src/acme/
-COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
-COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
-COPY letshelp-letsencrypt /opt/letsencrypt/src/letshelp-letsencrypt/
-COPY letsencrypt-compatibility-test /opt/letsencrypt/src/letsencrypt-compatibility-test/
-COPY tests /opt/letsencrypt/src/tests/
+COPY certbot /opt/certbot/src/certbot/
+COPY acme /opt/certbot/src/acme/
+COPY certbot-apache /opt/certbot/src/certbot-apache/
+COPY certbot-nginx /opt/certbot/src/certbot-nginx/
+COPY letshelp-certbot /opt/certbot/src/letshelp-certbot/
+COPY certbot-compatibility-test /opt/certbot/src/certbot-compatibility-test/
+COPY tests /opt/certbot/src/tests/
 
-RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
-    /opt/letsencrypt/venv/bin/pip install \
-    -e /opt/letsencrypt/src/acme \
-    -e /opt/letsencrypt/src \
-    -e /opt/letsencrypt/src/letsencrypt-apache \
-    -e /opt/letsencrypt/src/letsencrypt-nginx \
-    -e /opt/letsencrypt/src/letshelp-letsencrypt \
-    -e /opt/letsencrypt/src/letsencrypt-compatibility-test \
-    -e /opt/letsencrypt/src[dev,docs]
+RUN virtualenv --no-site-packages -p python2 /opt/certbot/venv && \
+    /opt/certbot/venv/bin/pip install \
+    -e /opt/certbot/src/acme \
+    -e /opt/certbot/src \
+    -e /opt/certbot/src/certbot-apache \
+    -e /opt/certbot/src/certbot-nginx \
+    -e /opt/certbot/src/letshelp-certbot \
+    -e /opt/certbot/src/certbot-compatibility-test \
+    -e /opt/certbot/src[dev,docs]
 
 # install in editable mode (-e) to save space: it's not possible to
-# "rm -rf /opt/letsencrypt/src" (it's stays in the underlaying image);
+# "rm -rf /opt/certbot/src" (it's stays in the underlaying image);
 # this might also help in debugging: you can "docker run --entrypoint
 # bash" and investigate, apply patches, etc.
 
-ENV PATH /opt/letsencrypt/venv/bin:$PATH
+ENV PATH /opt/certbot/venv/bin:$PATH

MANIFEST.in

@@ -5,4 +5,4 @@ include LICENSE.txt
 include linter_plugin.py
 recursive-include docs *
 recursive-include examples *
-recursive-include letsencrypt/tests/testdata *
+recursive-include certbot/tests/testdata *

acme/setup.py

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

certbot-compatibility-test/README.rst

@@ -1 +1 @@
-Compatibility tests for Let's Encrypt client
+Compatibility tests for Certbot

certbot/cli.py

@@ -634,7 +634,7 @@ def prepare_and_parse_args(plugins, args, detect_defaults=False):
              "at this system. This option cannot be used with --csr.")
     helpful.add(
         "automation", "--agree-tos", dest="tos", action="store_true",
-        help="Agree to the Let's Encrypt Subscriber Agreement")
+        help="Agree to the ACME Subscriber Agreement")
     helpful.add(
         "automation", "--account", metavar="ACCOUNT_ID",
         help="Account ID to use")

docker-compose.yml

@@ -3,12 +3,12 @@ production:
   ports:
     - "443:443"
 
-# For development, mount git root to /opt/letsencrypt/src in order to
+# For development, mount git root to /opt/certbot/src in order to
 # make the dev workflow more vagrant-like.
 development:
   build: .
   ports:
     - "443:443"
   volumes:
-    - .:/opt/letsencrypt/src
-    - /opt/letsencrypt/venv
+    - .:/opt/certbot/src
+    - /opt/certbot/venv

examples/cli.ini

@@ -1,5 +1,5 @@
 # This is an example of the kind of things you can do in a configuration file.
-# All flags used by the client can be configured here. Run Let's Encrypt with
+# All flags used by the client can be configured here. Run Certbot with
 # "--help" to learn more about the available options.
 
 # Use a 4096 bit RSA key instead of 2048

examples/generate-csr.sh

@@ -25,4 +25,4 @@ SAN="$domains" openssl req -config "${OPENSSL_CNF:-openssl.cnf}" \
   -outform DER
 # 512 or 1024 too low for Boulder, 2048 is smallest for tests
 
-echo "You can now run: letsencrypt auth --csr ${CSR_PATH:-csr.der}"
+echo "You can now run: certbot auth --csr ${CSR_PATH:-csr.der}"

examples/plugins/certbot_example_plugins.py

@@ -1,12 +1,12 @@
-"""Example Let's Encrypt plugins.
+"""Example Certbot plugins.
 
-For full examples, see `letsencrypt.plugins`.
+For full examples, see `certbot.plugins`.
 
 """
 import zope.interface
 
-from letsencrypt import interfaces
-from letsencrypt.plugins import common
+from certbot import interfaces
+from certbot.plugins import common
 
 
 @zope.interface.implementer(interfaces.IAuthenticator)

examples/plugins/setup.py

@@ -2,16 +2,16 @@ from setuptools import setup
 
 
 setup(
-    name='letsencrypt-example-plugins',
-    package='letsencrypt_example_plugins.py',
+    name='certbot-example-plugins',
+    package='certbot_example_plugins.py',
     install_requires=[
-        'letsencrypt',
+        'certbot',
         'zope.interface',
     ],
     entry_points={
-        'letsencrypt.plugins': [
-            'example_authenticator = letsencrypt_example_plugins:Authenticator',
-            'example_installer = letsencrypt_example_plugins:Installer',
+        'certbot.plugins': [
+            'example_authenticator = certbot_example_plugins:Authenticator',
+            'example_installer = certbot_example_plugins:Installer',
         ],
     },
 )

linter_plugin.py

@@ -1,4 +1,4 @@
-"""Let's Encrypt ACME PyLint plugin.
+"""Certbot ACME PyLint plugin.
 
 http://docs.pylint.org/plugins.html
 

pep8.travis.sh

@@ -8,10 +8,10 @@ pep8 --config=acme/.pep8 acme
 pep8 \
   setup.py \
   certbot \
-  letsencrypt-apache \
-  letsencrypt-nginx \
-  letsencrypt-compatibility-test \
-  letshelp-letsencrypt \
+  certbot-apache \
+  certbot-nginx \
+  certbot-compatibility-test \
+  letshelp-certbot \
   || echo "PEP8 checking failed, but it's ignored in Travis"
 
 # echo exits with 0

tests/boulder-integration.sh

@@ -21,7 +21,7 @@ else
 fi
 
 common_no_force_renew() {
-    letsencrypt_test_no_force_renew \
+    certbot_test_no_force_renew \
         --authenticator standalone \
         --installer null \
         "$@"
@@ -94,5 +94,5 @@ common revoke --cert-path "$root/conf/live/le2.wtf/cert.pem" \
 
 if type nginx;
 then
-    . ./letsencrypt-nginx/tests/boulder-integration.sh
+    . ./certbot-nginx/tests/boulder-integration.sh
 fi

tools/release.sh

@@ -28,7 +28,7 @@ if [ "$1" = "--production" ] ; then
     CheckVersion "Next version" "$nextversion"
     RELEASE_BRANCH="candidate-$version"
 else
-    version=`grep "__version__" letsencrypt/__init__.py | cut -d\' -f2 | sed s/\.dev0//`
+    version=`grep "__version__" certbot/__init__.py | cut -d\' -f2 | sed s/\.dev0//`
     version="$version.dev$(date +%Y%m%d)1"
     RELEASE_BRANCH="dev-release"
     echo Releasing developer version "$version"...
@@ -45,10 +45,10 @@ export GPG_TTY=$(tty)
 PORT=${PORT:-1234}
 
 # subpackages to be released
-SUBPKGS=${SUBPKGS:-"acme letsencrypt-apache letsencrypt-nginx letshelp-letsencrypt"}
+SUBPKGS=${SUBPKGS:-"acme certbot-apache certbot-nginx letshelp-certbot"}
 subpkgs_modules="$(echo $SUBPKGS | sed s/-/_/g)"
-# letsencrypt_compatibility_test is not packaged because:
-# - it is not meant to be used by anyone else than Let's Encrypt devs
+# certbot_compatibility_test is not packaged because:
+# - it is not meant to be used by anyone else than Certbot devs
 # - it causes problems when running nosetests - the latter tries to
 #   run everything that matches test*, while there are no unittests
 #   there
@@ -83,14 +83,14 @@ git checkout "$RELEASE_BRANCH"
 
 SetVersion() {
     ver="$1"
-    for pkg_dir in $SUBPKGS letsencrypt-compatibility-test
+    for pkg_dir in $SUBPKGS certbot-compatibility-test
     do
       sed -i "s/^version.*/version = '$ver'/" $pkg_dir/setup.py
     done
-    sed -i "s/^__version.*/__version__ = '$ver'/" letsencrypt/__init__.py
+    sed -i "s/^__version.*/__version__ = '$ver'/" certbot/__init__.py
     
     # interactive user input
-    git add -p letsencrypt $SUBPKGS letsencrypt-compatibility-test 
+    git add -p certbot $SUBPKGS certbot-compatibility-test 
 
 }
 
@@ -117,7 +117,7 @@ done
 
 
 mkdir "dist.$version"
-mv dist "dist.$version/letsencrypt"
+mv dist "dist.$version/certbot"
 for pkg_dir in $SUBPKGS
 do
   mv $pkg_dir/dist "dist.$version/$pkg_dir/"
@@ -140,7 +140,7 @@ pip install -U pip
 pip install \
   --no-cache-dir \
   --extra-index-url http://localhost:$PORT \
-  letsencrypt $SUBPKGS
+  certbot $SUBPKGS
 # stop local PyPI
 kill $!
 cd ~-
@@ -155,14 +155,14 @@ mkdir ../kgs
 kgs="../kgs/$version"
 pip freeze | tee $kgs
 pip install nose
-for module in letsencrypt $subpkgs_modules ; do
+for module in certbot $subpkgs_modules ; do
     echo testing $module
     nosetests $module
 done
 deactivate
 
 # pin pip hashes of the things we just built
-for pkg in acme letsencrypt letsencrypt-apache ; do
+for pkg in acme certbot certbot-apache ; do
     echo $pkg==$version \\
     pip hash dist."$version/$pkg"/*.{whl,gz} | grep "^--hash" | python2 -c 'from sys import stdin; input = stdin.read(); print "   ", input.replace("\n--hash", " \\\n    --hash"),'
 done > /tmp/hashes.$$

tools/venv.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -xe
-# Developer virtualenv setup for Let's Encrypt client
+# Developer virtualenv setup for Certbot client
 
 export VENV_ARGS="--python python2"
 

tools/venv3.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -xe
-# Developer Python3 virtualenv setup for Let's Encrypt
+# Developer Python3 virtualenv setup for Certbot
 
 export VENV_NAME="${VENV_NAME:-venv3}"
 export VENV_ARGS="--python python3"