Merge pull request #372 from ucam-department-of-psychiatry/camcops-do…

…cker-fix

Fix installer to set the SSL config options only if using https directly

docs/source/changelog.rst

@@ -3931,3 +3931,6 @@ Current C++/SQLite client, Python/SQLAlchemy server
 - Fix bugs in the "strict" validation of double-precision floating-point values
  where valid values were being rejected.
  https:/ucam-department-of-psychiatry/camcops/issues/368
+
+- Fix the installer to set the SSL options in the config file only if using
+ HTTPS directly.

server/installer/installer.py

@@ -608,6 +608,17 @@ def create_config(self) -> None:
  self.configure_config()
 
  def configure_config(self) -> None:
+ ssl_certificate = ""
+ ssl_private_key = ""
+
+ if self.use_https():
+ ssl_certificate = os.path.join(
+ DockerPath.CONFIG_DIR, "camcops.crt"
+ )
+ ssl_private_key = os.path.join(
+ DockerPath.CONFIG_DIR, "camcops.key"
+ )
+
  replace_dict = {
  "db_server": os.getenv(
  InstallerEnvVar.MYSQL_SERVER,
@@ -625,12 +636,8 @@ def configure_config(self) -> None:
  DockerEnvVar.MYSQL_DATABASE_NAME,
  ),
  "host": "0.0.0.0",
- "ssl_certificate": os.path.join(
- DockerPath.CONFIG_DIR, "camcops.crt"
- ),
- "ssl_private_key": os.path.join(
- DockerPath.CONFIG_DIR, "camcops.key"
- ),
+ "ssl_certificate": ssl_certificate,
+ "ssl_private_key": ssl_private_key,
  }
 
  self.search_replace_file(self.config_full_path(), replace_dict)