Merge pull request #177 from sdktr/patch-2

cimnine · web-flow · commit bf2a21ddeab1 · 2019-12-10T22:39:53.000+01:00
Add SSLMODE to database connection settings
diff --git a/configuration/configuration.py b/configuration/configuration.py
@@ -37,6 +37,8 @@ def read_secret(secret_name):
                                                          # PostgreSQL password
     'HOST': os.environ.get('DB_HOST', 'localhost'),      # Database server
     'PORT': os.environ.get('DB_PORT', ''),               # Database port (leave blank for default)
+    'OPTIONS': {'sslmode': os.environ.get('DB_SSLMODE', 'prefer')}, 
+                                                         # Database connection SSLMODE
     'CONN_MAX_AGE': int(os.environ.get('DB_CONN_MAX_AGE', '300')), 
                                                          # Database connection persistence
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ def read_secret(secret_name):`
`37`	`37`	`# PostgreSQL password`
`38`	`38`	`'HOST': os.environ.get('DB_HOST', 'localhost'), # Database server`
`39`	`39`	`'PORT': os.environ.get('DB_PORT', ''), # Database port (leave blank for default)`
	`40`	`+ 'OPTIONS': {'sslmode': os.environ.get('DB_SSLMODE', 'prefer')},`
	`41`	`+ # Database connection SSLMODE`
`40`	`42`	`'CONN_MAX_AGE': int(os.environ.get('DB_CONN_MAX_AGE', '300')),`
`41`	`43`	`# Database connection persistence`
`42`	`44`	`}`