Merge pull request #7758 from EmanuelOverflow/master

SSL Certificate are not used if they are in configuration file
ckan · Aug 29, 2023 · 819818e · 819818e
2 parents ded802e + 7e885d7
commit 819818e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changes/7758.bugfix b/changes/7758.bugfix
@@ -0,0 +1 @@
+Fixed server does not recognize ssl settings in configuration .ini file
diff --git a/ckan/cli/server.py b/ckan/cli/server.py
@@ -95,7 +95,7 @@ def run(ctx: click.Context, host: str, port: str, disable_reloader: bool,
         if cert_file == key_file == 'adhoc':
             ssl_context = 'adhoc'
         else:
-            ssl_context = (ssl_cert, ssl_key)
+            ssl_context = (cert_file, key_file)
     else:
         ssl_context = None