Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SSL option for redis client #5

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Thumbor redis storage adapters.
To use redis as a storage or result storage some values must be configured in `thumbor.conf`

##### Redis Storage

```
STORAGE='tc_redis.storages.redis_storage'

Expand All @@ -21,6 +22,9 @@ REDIS_STORAGE_SERVER_PORT = 6379
REDIS_STORAGE_SERVER_HOST = 'localhost'
REDIS_STORAGE_SERVER_DB = 0
REDIS_STORAGE_SERVER_PASSWORD = None
REDIS_STORAGE_SERVER_SSL_ENABLED = False
REDIS_STORAGE_SERVER_SSL_CERTS = '/path/to/certs'
REDIS_STORAGE_SERVER_SSL_CHECK_DISABLED = False
```

##### Redis Result Storage
Expand All @@ -33,4 +37,7 @@ REDIS_RESULT_STORAGE_SERVER_PORT = 6379
REDIS_RESULT_STORAGE_SERVER_HOST = 'localhost'
REDIS_RESULT_STORAGE_SERVER_DB = 0
REDIS_RESULT_STORAGE_SERVER_PASSWORD = None
REDIS_RESULT_STORAGE_SERVER_SSL_ENABLED = False
REDIS_RESULT_STORAGE_SERVER_SSL_CERTS = '/path/to/certs'
REDIS_RESULT_STORAGE_SERVER_SSL_CHECK_DISABLED = False
```
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
redis
redis>=3.5
thumbor>=5.0.0
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def read(fname):

setup(
name="tc_redis",
version="1.0.1",
version="1.1.0",
author="Thumbor Community",
description=("Thumbor redis storage adapters"),
license="MIT",
Expand All @@ -29,6 +29,6 @@ def read(fname):
],
install_requires=[
'thumbor>=5.0.0',
'redis'
'redis>=3.5'
]
)
5 changes: 4 additions & 1 deletion tc_redis/result_storages/redis_result_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ def reconnect_redis(self):
port=self.context.config.REDIS_RESULT_STORAGE_SERVER_PORT,
host=self.context.config.REDIS_RESULT_STORAGE_SERVER_HOST,
db=self.context.config.REDIS_RESULT_STORAGE_SERVER_DB,
password=self.context.config.REDIS_RESULT_STORAGE_SERVER_PASSWORD
password=self.context.config.REDIS_RESULT_STORAGE_SERVER_PASSWORD,
ssl=self.context.config.REDIS_RESULT_STORAGE_SERVER_SSL_ENABLED
ssl_ca_certs=self.context.config.REDIS_RESULT_STORAGE_SERVER_SSL_CERTS
ssl_cert_reqs=self.context.config.REDIS_RESULT_STORAGE_SERVER_SSL_CHECK_DISABLED
)

if self.shared_client:
Expand Down
5 changes: 4 additions & 1 deletion tc_redis/storages/redis_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ def reconnect_redis(self):
port=self.context.config.REDIS_STORAGE_SERVER_PORT,
host=self.context.config.REDIS_STORAGE_SERVER_HOST,
db=self.context.config.REDIS_STORAGE_SERVER_DB,
password=self.context.config.REDIS_STORAGE_SERVER_PASSWORD
password=self.context.config.REDIS_STORAGE_SERVER_PASSWORD,
ssl=self.context.config.REDIS_STORAGE_SERVER_SSL_ENABLED
ssl_ca_certs=self.context.config.REDIS_STORAGE_SERVER_SSL_CERTS
ssl_cert_reqs=self.context.config.REDIS_STORAGE_SERVER_SSL_CHECK_DISABLED
)

if self.shared_client:
Expand Down