starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 00:22:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282 from kuba/eula

Browse Source 
EULA using pkg_resources (fixes #278)
This commit is contained in:
James Kasten
2015-03-11 15:00:39 -04:00
parent 2f85606d08 97165b8711
commit afd7db3a69
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EULA
-5
View File
@@ -1,5 +0,0 @@
This is a PREVIEW RELEASE of a client application for the Let's Encrypt certificate authority and other services using the ACME protocol. The Let's Encrypt certificate authority is NOT YET ISSUING CERTIFICATES TO THE PUBLIC.
Until publicly-trusted certificates can be issued by Let's Encrypt, this software CANNOT OBTAIN A PUBLICLY-TRUSTED CERTIFICATE FOR YOUR WEB SERVER. You should only use this program if you are a developer interested in experimenting with the ACME protocol or in helping to improve this software. If you want to configure your web site with HTTPS in the meantime, please obtain a certificate from a different authority.
For updates on the status of Let's Encrypt, please visit the Let's Encrypt home page at https://letsencrypt.org/.
EULA
Symlink
+1
View File
@@ -0,0 +1 @@
letsencrypt/EULA
MANIFEST.in
+1
View File
@@ -2,6 +2,7 @@ include README.rst
include CHANGES.rst include CHANGES.rst
include CONTRIBUTING.rst include CONTRIBUTING.rst
include linter_plugin.py include linter_plugin.py
include letsencrypt/EULA
recursive-include letsencrypt *.json recursive-include letsencrypt *.json
recursive-include letsencrypt *.conf recursive-include letsencrypt *.conf
recursive-include letsencrypt/client/tests/testdata * recursive-include letsencrypt/client/tests/testdata *
letsencrypt/EULA
+5
View File
@@ -0,0 +1,5 @@
This is a PREVIEW RELEASE of a client application for the Let's Encrypt certificate authority and other services using the ACME protocol. The Let's Encrypt certificate authority is NOT YET ISSUING CERTIFICATES TO THE PUBLIC.
Until publicly-trusted certificates can be issued by Let's Encrypt, this software CANNOT OBTAIN A PUBLICLY-TRUSTED CERTIFICATE FOR YOUR WEB SERVER. You should only use this program if you are a developer interested in experimenting with the ACME protocol or in helping to improve this software. If you want to configure your web site with HTTPS in the meantime, please obtain a certificate from a different authority.
For updates on the status of Let's Encrypt, please visit the Let's Encrypt home page at https://letsencrypt.org/.
letsencrypt/scripts/main.py
+5 -4
View File
@@ -7,6 +7,7 @@
import argparse import argparse
import logging import logging
import os import os
import pkg_resources
import sys import sys
import confargparse import confargparse
@@ -191,10 +192,10 @@ def main(): # pylint: disable=too-many-branches, too-many-statements
def display_eula(): def display_eula():
"""Displays the end user agreement.""" """Displays the end user agreement."""
with open("EULA") as eula_file: eula = pkg_resources.resource_string("letsencrypt", "EULA")
if not zope.component.getUtility(interfaces.IDisplay).yesno( if not zope.component.getUtility(interfaces.IDisplay).yesno(
eula_file.read(), "Agree", "Cancel"): eula, "Agree", "Cancel"):
sys.exit(0) sys.exit(0)
def read_file(filename): def read_file(filename):