Merge pull request #1729 from Logflare/fix/temp-disable-staging-ssl

chore: temp disable staging ssl
Logflare · Oct 9, 2023 · 9bc5d5c · 9bc5d5c
2 parents 03011fa + e437889
commit 9bc5d5c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.staging.cacert.key.enc b/.staging.cacert.key.enc
diff --git a/.staging.cacert.pem.enc b/.staging.cacert.pem.enc
diff --git a/.staging.cert.key.enc b/.staging.cert.key.enc
diff --git a/.staging.cert.pem.enc b/.staging.cert.pem.enc
diff --git a/.staging.env.enc b/.staging.env.enc
diff --git a/config/runtime.exs b/config/runtime.exs
@@ -47,22 +47,22 @@ config :logflare,
              else: nil
            ),
          ssl: System.get_env("DB_SSL") == "true",
-         ssl_opts:
-           if(System.get_env("DB_SSL") == "true",
-             do: [
-               #  ssl opts follow recs here: https://erlef.github.io/security-wg/secure_coding_and_deployment_hardening/ssl
-               verify: :verify_peer,
-               cacerts: :public_key.cacerts_get(),
-               # allow intermediate CA
-               depth: 3,
-               versions: [:"tlsv1.2"],
-               # support wildcard
-               customize_hostname_check: [
-                 match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
-               ]
-             ],
-             else: nil
-           ),
+         #  ssl_opts:
+         #    if(System.get_env("DB_SSL") == "true",
+         #      do: [
+         #        #  ssl opts follow recs here: https://erlef.github.io/security-wg/secure_coding_and_deployment_hardening/ssl
+         #        verify: :verify_peer,
+         #        cacerts: :public_key.cacerts_get(),
+         #        # allow intermediate CA
+         #        depth: 3,
+         #        versions: [:"tlsv1.2"],
+         #        # support wildcard
+         #        customize_hostname_check: [
+         #          match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
+         #        ]
+         #      ],
+         #      else: nil
+         #    ),
          database: System.get_env("DB_DATABASE"),
          hostname: System.get_env("DB_HOSTNAME"),
          password: System.get_env("DB_PASSWORD"),

diff --git a/gcloud_staging.json.enc b/gcloud_staging.json.enc