Compare commits
1 Commits
master
...
fix-pyopen
Author | SHA1 | Date |
---|---|---|
Sebastian Lohff | 20ea0c10a4 |
|
@ -6,6 +6,7 @@ Unreleased
|
||||||
----------
|
----------
|
||||||
|
|
||||||
* fixed bug where exception was shown on transmission abort with python3
|
* fixed bug where exception was shown on transmission abort with python3
|
||||||
|
* fixed wrong/outdated pyopenssl package names
|
||||||
|
|
||||||
|
|
||||||
2020-10-30 v0.5.1
|
2020-10-30 v0.5.1
|
||||||
|
|
|
@ -28,8 +28,8 @@ In upload mode with \fB\-u\fR servefile creates a directory and saves all
|
||||||
uploaded files into that directory. When uploading with curl or wget the
|
uploaded files into that directory. When uploading with curl or wget the
|
||||||
filename is extracted from the path part of the url used for the upload.
|
filename is extracted from the path part of the url used for the upload.
|
||||||
|
|
||||||
For SSL support python-openssl (pyssl) needs to be installed. If no key and
|
For SSL support pyopenssl (python3-openssl) needs to be installed. If no key
|
||||||
cert is given, servefile will generate a key pair for you and display its
|
and cert is given, servefile will generate a key pair for you and display its
|
||||||
fingerprint.
|
fingerprint.
|
||||||
|
|
||||||
In \fB--tar\fR mode the given file or directory will be packed on (each)
|
In \fB--tar\fR mode the given file or directory will be packed on (each)
|
||||||
|
|
|
@ -858,7 +858,7 @@ class ServeFile():
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def setSSLKeys(self, cert, key):
|
def setSSLKeys(self, cert, key):
|
||||||
""" Set SSL cert/key. Can be either path to file or pyssl X509/PKey object. """
|
""" Set SSL cert/key. Can be either path to file or pyopenssl X509/PKey object. """
|
||||||
self.cert = cert
|
self.cert = cert
|
||||||
self.key = key
|
self.key = key
|
||||||
|
|
||||||
|
@ -1167,7 +1167,7 @@ def main():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if args.ssl and not HAVE_SSL:
|
if args.ssl and not HAVE_SSL:
|
||||||
print("Error: SSL is not available, please install pyssl (python-openssl).")
|
print("Error: SSL is not available, please install pyopenssl (python3-openssl).")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if args.cert and not args.key:
|
if args.cert and not args.key:
|
||||||
|
|
Loading…
Reference in New Issue