Merge branch 'master' of github.com:letsencrypt/lets-encrypt-preview

This commit is contained in:
James Kasten 2014-11-19 09:55:25 -08:00
commit 1c1e63e322
3 changed files with 12 additions and 15 deletions

View file

@ -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)
```

View file

@ -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)"

View file

@ -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