From 9fb1e2a0287356086b459f7c87e12a55da91b340 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Tue, 18 Nov 2014 21:05:48 -0500 Subject: [PATCH 1/3] Make the 'command line usage' section slightly more readable --- README.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c19cf8cf6..3d2942830 100644 --- a/README.md +++ b/README.md @@ -21,20 +21,17 @@ handle debian unstable's Apache2 conf layout, either...) ## Command line usage +``` +sudo ./letsencrypt.py (default authentication mode using pythondialog) options -sudo ./letsencrypt.py (default authentication mode using pythondialog) - -options --text (text mode) +--text (text mode) --privkey= (specify privatekey file to use to generate the certificate) ---csr= (Use a specific CSR. If this is specified, privkey must also be -specified with the correct private key for the CSR) ---server (list the ACME CA server address) ---revoke (revoke a certificate) ---view-checkpoints (Used to view available checkpoints and see what -configuration changes have been made) +--csr= (Use a specific CSR. If this is specified, privkey must also be specified with the correct private key for the CSR) +--server (list the ACME CA server address) +--revoke (revoke a certificate) +--view-checkpoints (Used to view available checkpoints and see what configuration changes have been made) --rollback=X (Revert the configuration X number of checkpoints) ---redirect (Automatically redirect all HTTP traffic to HTTPS for the newly -authenticated vhost) ---no-redirect (Skip the HTTPS redirect question, allowing both HTTP and -HTTPS) +--redirect (Automatically redirect all HTTP traffic to HTTPS for the newly authenticated vhost) +--no-redirect (Skip the HTTPS redirect question, allowing both HTTP and HTTPS) --agree-eula (Skip the end user agreement screen) +``` From c6d58640b24308f3905bc19e1f5f688545d7725b Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Wed, 19 Nov 2014 09:39:11 +0100 Subject: [PATCH 2/3] Fixed small typo in usage() --- letsencrypt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt.py b/letsencrypt.py index 5feedcb74..20f4f6ffb 100755 --- a/letsencrypt.py +++ b/letsencrypt.py @@ -96,7 +96,7 @@ def usage(): s = "Available options: --text, --privkey=, --csr=, --server=, " s += "--rollback=, --view-checkpoints, --revoke, --agree-eula, --redirect," s += " --no-redirect, --help" - print str + print s def print_options(): print "\nsudo ./letsencrypt.py (default authentication mode using pythondialog)" From 319e985616137959ba160c9c31fdf9663f38a57a Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Wed, 19 Nov 2014 15:29:21 +0200 Subject: [PATCH 3/3] Correct dependency. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ac9f7f3f1..f38fbe085 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ M2Crypto==0.22.3 -pythondialog==2.7 +python2-pythondialog jose==0.1 jsonschema==2.4.0 #python-augeas==0.5.0