| From fa8dc227f8b1804bb3ccae38db168f32c34cfc27 Mon Sep 17 00:00:00 2001 |
| From: Prathmesh Prabhu <pprabhu@chromium.org> |
| Date: Tue, 6 Jan 2015 13:31:00 +0530 |
| Subject: Fix mysql backend to pass the ssl options through. |
| |
| --- |
| lib/django-1.5/django/db/backends/mysql/client.py | 13 +++++++++++++ |
| 1 file changed, 13 insertions(+) |
| |
| diff --git a/lib/django-1.5/django/db/backends/mysql/client.py b/lib/django-1.5/django/db/backends/mysql/client.py |
| index 1cf8cee..f395564 100644 |
| --- a/lib/django-1.5/django/db/backends/mysql/client.py |
| +++ b/lib/django-1.5/django/db/backends/mysql/client.py |
| @@ -15,6 +15,14 @@ class DatabaseClient(BaseDatabaseClient): |
| host = settings_dict['OPTIONS'].get('host', settings_dict['HOST']) |
| port = settings_dict['OPTIONS'].get('port', settings_dict['PORT']) |
| defaults_file = settings_dict['OPTIONS'].get('read_default_file') |
| + |
| + # ssl options |
| + ssl = settings_dict['OPTIONS'].get('ssl') |
| + if ssl: |
| + server_ca = ssl.get('ca', '') |
| + client_cert = ssl.get('cert', '') |
| + client_key = ssl.get('key', '') |
| + |
| # Seems to be no good way to set sql_mode with CLI. |
| |
| if defaults_file: |
| @@ -30,6 +38,11 @@ class DatabaseClient(BaseDatabaseClient): |
| args += ["--host=%s" % host] |
| if port: |
| args += ["--port=%s" % port] |
| + if ssl: |
| + args += ["--ssl-ca=%s" % server_ca] |
| + args += ["--ssl-cert=%s" % client_cert] |
| + args += ["--ssl-key=%s" % client_key] |
| + |
| if db: |
| args += [db] |
| |
| -- |
| 2.2.0.rc0.207.ga3a616c |
| |