Merge pull request #1048 from kuba/agree-dev-preview

--agree-dev-preview

DISCLAIMER

@@ -0,0 +1 @@
+letsencrypt/DISCLAIMER

Dockerfile-dev

@@ -32,7 +32,7 @@ RUN /opt/letsencrypt/src/ubuntu.sh && \
 # 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 requirements.txt EULA 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 requirements.txt DISCLAIMER 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...

EULA

@@ -1 +0,0 @@
-letsencrypt/EULA

MANIFEST.in

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

examples/dev-cli.ini

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

letsencrypt/cli.py

@@ -763,8 +763,8 @@ def create_parser(plugins, args):
         help="Select renewal by default when domains are a superset of a "
              "a previously attained cert")
     helpful.add(
-        "automation", "--agree-eula", dest="eula", action="store_true",
-        help="Agree to the Let's Encrypt Developer Preview EULA")
+        "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")
@@ -1060,11 +1060,11 @@ def main(cli_args=sys.argv[1:]):
     zope.component.provideUtility(report)
     atexit.register(report.atexit_print_messages)
 
-    # TODO: remove developer EULA prompt for the launch
-    if not config.eula:
-        eula = pkg_resources.resource_string("letsencrypt", "EULA")
+    # 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(
-                eula, "Agree", "Cancel"):
+                disclaimer, "Agree", "Cancel"):
             raise Error("Must agree to TOS")
 
     if not os.geteuid() == 0:

letsencrypt/tests/cli_test.py

@@ -38,7 +38,7 @@ class CLITest(unittest.TestCase):
         from letsencrypt import cli
         args = ['--text', '--config-dir', self.config_dir,
                 '--work-dir', self.work_dir, '--logs-dir', self.logs_dir,
-                '--agree-eula'] + args
+                '--agree-dev-preview'] + args
         with mock.patch('letsencrypt.cli.sys.stdout') as stdout:
             with mock.patch('letsencrypt.cli.sys.stderr') as stderr:
                 with mock.patch('letsencrypt.cli.client') as client:
@@ -53,7 +53,7 @@ class CLITest(unittest.TestCase):
         from letsencrypt import cli
         args = ['--text', '--config-dir', self.config_dir,
                 '--work-dir', self.work_dir, '--logs-dir', self.logs_dir,
-                '--agree-eula'] + args
+                '--agree-dev-preview'] + args
         with mock.patch('letsencrypt.cli.sys.stderr') as stderr:
             with mock.patch('letsencrypt.cli.client') as client:
                 ret = cli.main(args)
@@ -96,7 +96,8 @@ class CLITest(unittest.TestCase):
 
     def test_configurator_selection(self):
         real_plugins = disco.PluginsRegistry.find_all()
-        args = ['--agree-eula', '--apache', '--authenticator', 'standalone']
+        args = ['--agree-dev-preview', '--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

@@ -20,7 +20,7 @@ letsencrypt_test () {
         --manual-test-mode \
         $store_flags \
         --text \
-        --agree-eula \
+        --agree-dev-preview \
         --agree-tos \
         --email "" \
         --renew-by-default \