Merge pull request certbot#1651 from letsencrypt/prep4prod

Prepare for public beta

Dockerfile-dev

@@ -33,7 +33,7 @@ RUN /opt/letsencrypt/src/ubuntu.sh && \
 # Dockerfile we make sure we cache as much as possible
 
 # py26reqs.txt not installed!
-COPY setup.py README.rst CHANGES.rst MANIFEST.in DISCLAIMER 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/letsencrypt/src/
 
 # all above files are necessary for setup.py, however, package source
 # code directory has to be copied separately to a subdirectory...

MANIFEST.in

@@ -4,7 +4,6 @@ include CHANGES.rst
 include CONTRIBUTING.md
 include LICENSE.txt
 include linter_plugin.py
-include letsencrypt/DISCLAIMER
 recursive-include docs *
 recursive-include examples *
 recursive-include letsencrypt/tests/testdata *

examples/dev-cli.ini

@@ -8,7 +8,6 @@ email = [email protected]
 domains = example.com
 
 text = True
-agree-dev-preview = True
 agree-tos = True
 debug = True
 # Unfortunately, it's not possible to specify "verbose" multiple times

letsencrypt/cli.py

@@ -9,7 +9,6 @@
 import logging
 import logging.handlers
 import os
-import pkg_resources
 import sys
 import time
 import traceback
@@ -762,6 +761,20 @@ def add(self, topic, *args, **kwargs):
             kwargs["help"] = argparse.SUPPRESS
             self.parser.add_argument(*args, **kwargs)
 
+    def add_deprecated_argument(self, argument_name, num_args):
+        """Adds a deprecated argument with the name argument_name.
+
+        Deprecated arguments are not shown in the help. If they are used
+        on the command line, a warning is shown stating that the
+        argument is deprecated and no other action is taken.
+
+        :param str argument_name: Name of deprecated argument.
+        :param int nargs: Number of arguments the option takes.
+
+        """
+        le_util.add_deprecated_argument(
+            self.parser.add_argument, argument_name, num_args)
+
     def add_group(self, topic, **kwargs):
         """
 
@@ -871,9 +884,6 @@ def prepare_and_parse_args(plugins, args):
         "automation", "--renew-by-default", action="store_true",
         help="Select renewal by default when domains are a superset of a "
              "previously attained cert")
-    helpful.add(
-        "automation", "--agree-dev-preview", action="store_true",
-        help="Agree to the Let's Encrypt Developer Preview Disclaimer")
     helpful.add(
         "automation", "--agree-tos", dest="tos", action="store_true",
         help="Agree to the Let's Encrypt Subscriber Agreement")
@@ -938,6 +948,8 @@ def prepare_and_parse_args(plugins, args):
         help="Require that all configuration files are owned by the current "
              "user; only needed if your config is somewhere unsafe like /tmp/")
 
+    helpful.add_deprecated_argument("--agree-dev-preview", 0)
+
     _create_subparsers(helpful)
     _paths_parser(helpful)
     # _plugins_parsing should be the last thing to act upon the main
@@ -1257,13 +1269,6 @@ def main(cli_args=sys.argv[1:]):
     zope.component.provideUtility(report)
     atexit.register(report.atexit_print_messages)
 
-    # TODO: remove developer preview prompt for the launch
-    if not config.agree_dev_preview:
-        disclaimer = pkg_resources.resource_string("letsencrypt", "DISCLAIMER")
-        if not zope.component.getUtility(interfaces.IDisplay).yesno(
-                disclaimer, "Agree", "Cancel"):
-            raise errors.Error("Must agree to TOS")
-
     if not os.geteuid() == 0:
         logger.warning(
             "Root (sudo) is required to run most of letsencrypt functionality.")

letsencrypt/constants.py

@@ -16,7 +16,7 @@
                      "letsencrypt", "cli.ini"),
     ],
     verbose_count=-(logging.WARNING / 10),
-    server="https://acme-staging.api.letsencrypt.org/directory",
+    server="https://acme-v01.api.letsencrypt.org/directory",
     rsa_key_size=2048,
     rollback_checkpoints=1,
     config_dir="/etc/letsencrypt",

letsencrypt/tests/cli_test.py

@@ -39,9 +39,9 @@ def setUp(self):
         self.config_dir = os.path.join(self.tmp_dir, 'config')
         self.work_dir = os.path.join(self.tmp_dir, 'work')
         self.logs_dir = os.path.join(self.tmp_dir, 'logs')
-        self.standard_args = ['--text', '--config-dir', self.config_dir,
-                              '--work-dir', self.work_dir, '--logs-dir',
-                              self.logs_dir, '--agree-dev-preview']
+        self.standard_args = ['--config-dir', self.config_dir,
+                              '--work-dir', self.work_dir,
+                              '--logs-dir', self.logs_dir, '--text']
 
     def tearDown(self):
         shutil.rmtree(self.tmp_dir)
@@ -183,8 +183,7 @@ def test_installer_selection(self, mock_display_ops, _rec):
     def test_configurator_selection(self, mock_exe_exists):
         mock_exe_exists.return_value = True
         real_plugins = disco.PluginsRegistry.find_all()
-        args = ['--agree-dev-preview', '--apache',
-                '--authenticator', 'standalone']
+        args = ['--apache', '--authenticator', 'standalone']
 
         # This needed two calls to find_all(), which we're avoiding for now
         # because of possible side effects:

tests/integration/_common.sh

@@ -21,7 +21,6 @@ letsencrypt_test () {
         $store_flags \
         --text \
         --no-redirect \
-        --agree-dev-preview \
         --agree-tos \
         --register-unsafely-without-email \
         --renew-by-default \