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

Merge remote-tracking branch 'github/master' into setuptools-script

Browse Source 
Conflicts:
	README.md
	letsencrypt.py
This commit is contained in:
Jakub Warmuz
2014-11-19 20:36:14 +01:00
parent 69ebee9bf2 1c1e63e322
commit d5d1ec8b1c
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+8 -11
View File
@@ -21,22 +21,19 @@ conf layout.
`python setup.py develop --user` `python setup.py develop --user`
## Command line usage ## Command line usage
sudo ./letsencrypt.py (default authentication mode using pythondialog) ```
sudo ./letsencrypt.py (default authentication mode using pythondialog) options
options --text (text mode) --text (text mode)
--privkey= (specify privatekey file to use to generate the certificate) --privkey= (specify privatekey file to use to generate the certificate)
--csr= (Use a specific CSR. If this is specified, privkey must also be --csr= (Use a specific CSR. If this is specified, privkey must also be specified with the correct private key for the CSR)
specified with the correct private key for the CSR)
--server (list the ACME CA server address) --server (list the ACME CA server address)
--revoke (revoke a certificate) --revoke (revoke a certificate)
--view-checkpoints (Used to view available checkpoints and see what --view-checkpoints (Used to view available checkpoints and see what configuration changes have been made)
configuration changes have been made)
--rollback=X (Revert the configuration X number of checkpoints) --rollback=X (Revert the configuration X number of checkpoints)
--redirect (Automatically redirect all HTTP traffic to HTTPS for the newly --redirect (Automatically redirect all HTTP traffic to HTTPS for the newly authenticated vhost)
authenticated vhost) --no-redirect (Skip the HTTPS redirect question, allowing both HTTP and HTTPS)
--no-redirect (Skip the HTTPS redirect question, allowing both HTTP and
HTTPS)
--agree-eula (Skip the end user agreement screen) --agree-eula (Skip the end user agreement screen)
```
letsencrypt/client/client.py
+1 -1
View File
@@ -79,7 +79,7 @@ class Client(object):
# found within the config to self.names # found within the config to self.names
# Then filters them based on user selection # Then filters them based on user selection
code, self.names = display.filter_names(self.get_all_names()) code, self.names = display.filter_names(self.get_all_names())
if code == display.OK: if code == display.OK and self.names:
# TODO: Allow multiple names once it is setup # TODO: Allow multiple names once it is setup
self.names = [self.names[0]] self.names = [self.names[0]]
else: else:
letsencrypt/scripts/main.py
+1 -1
View File
@@ -96,7 +96,7 @@ def usage():
s = "Available options: --text, --privkey=, --csr=, --server=, " s = "Available options: --text, --privkey=, --csr=, --server=, "
s += "--rollback=, --view-checkpoints, --revoke, --agree-eula, --redirect," s += "--rollback=, --view-checkpoints, --revoke, --agree-eula, --redirect,"
s += " --no-redirect, --help" s += " --no-redirect, --help"
print str print s
def print_options(): def print_options():
print "\nsudo ./letsencrypt.py (default authentication mode using pythondialog)" print "\nsudo ./letsencrypt.py (default authentication mode using pythondialog)"
requirements.txt
+1 -1
View File
@@ -1,5 +1,5 @@
M2Crypto==0.22.3 M2Crypto==0.22.3
pythondialog==2.7 python2-pythondialog
jose==0.1 jose==0.1
jsonschema==2.4.0 jsonschema==2.4.0
#python-augeas==0.5.0 #python-augeas==0.5.0