From 18fd4fdc5003b9d13d2e5736b053ca5012c0fe3a Mon Sep 17 00:00:00 2001 From: bernokl Date: Wed, 4 Dec 2024 19:43:40 +0000 Subject: [PATCH] chore: remove tls --- nix/cardano-services/deployments/asset.nix | 4 ---- nix/cardano-services/deployments/backend.provider.nix | 4 ---- .../deployments/blockfrost-worker-deployment.nix | 9 --------- nix/cardano-services/deployments/chain-history.nix | 2 -- nix/cardano-services/deployments/handle.nix | 4 ---- .../deployments/pg-boss-worker-deployment.nix | 11 ----------- .../deployments/projector.resource.nix | 8 -------- .../deployments/provider.resource.nix | 7 ------- nix/cardano-services/deployments/stake-pool.nix | 4 ---- nix/cardano-services/deployments/wallet-api.nix | 2 -- .../deployments/ws-server.deployment.nix | 9 --------- 11 files changed, 64 deletions(-) diff --git a/nix/cardano-services/deployments/asset.nix b/nix/cardano-services/deployments/asset.nix index c1f98810904..cca027c42d8 100644 --- a/nix/cardano-services/deployments/asset.nix +++ b/nix/cardano-services/deployments/asset.nix @@ -48,8 +48,6 @@ key = "username"; }; }; - POSTGRES_SSL_ASSET = "true"; - POSTGRES_SSL_CA_FILE_ASSET = "/tls/ca.crt"; }; }; @@ -88,8 +86,6 @@ key = "username"; }; }; - POSTGRES_SSL = "true"; - POSTGRES_SSL_CA_FILE = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/backend.provider.nix b/nix/cardano-services/deployments/backend.provider.nix index dccbf125e59..c94999ef91d 100644 --- a/nix/cardano-services/deployments/backend.provider.nix +++ b/nix/cardano-services/deployments/backend.provider.nix @@ -58,8 +58,6 @@ key = "username"; }; }; - POSTGRES_SSL_DB_SYNC = "true"; - POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; } // lib.optionalAttrs values.backend.passHandleDBArgs { POSTGRES_POOL_MAX_HANDLE = "10"; @@ -78,8 +76,6 @@ key = "username"; }; }; - POSTGRES_SSL_HANDLE = "true"; - POSTGRES_SSL_CA_FILE_HANDLE = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/blockfrost-worker-deployment.nix b/nix/cardano-services/deployments/blockfrost-worker-deployment.nix index 301700b249d..a0d5bf24238 100644 --- a/nix/cardano-services/deployments/blockfrost-worker-deployment.nix +++ b/nix/cardano-services/deployments/blockfrost-worker-deployment.nix @@ -64,18 +64,9 @@ key = "username"; }; }; - POSTGRES_SSL_DB_SYNC = "true"; - POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; }; - volumeMounts = [ - { - mountPath = "/tls"; - name = "tls"; - } - ]; } ]; - volumes.tls.secret.secretName = "postgresql-server-cert"; }; }; }; diff --git a/nix/cardano-services/deployments/chain-history.nix b/nix/cardano-services/deployments/chain-history.nix index 86443f487c7..c23e3c9e896 100644 --- a/nix/cardano-services/deployments/chain-history.nix +++ b/nix/cardano-services/deployments/chain-history.nix @@ -51,8 +51,6 @@ key = "username"; }; }; - POSTGRES_SSL_DB_SYNC = "true"; - POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/handle.nix b/nix/cardano-services/deployments/handle.nix index daee4bff016..2324e24a6d8 100644 --- a/nix/cardano-services/deployments/handle.nix +++ b/nix/cardano-services/deployments/handle.nix @@ -46,8 +46,6 @@ key = "username"; }; }; - POSTGRES_SSL_HANDLE = "true"; - POSTGRES_SSL_CA_FILE_HANDLE = "/tls/ca.crt"; }; }; @@ -88,8 +86,6 @@ key = "username"; }; }; - POSTGRES_SSL = "true"; - POSTGRES_SSL_CA_FILE = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/pg-boss-worker-deployment.nix b/nix/cardano-services/deployments/pg-boss-worker-deployment.nix index f77160fe11e..786dc936e19 100644 --- a/nix/cardano-services/deployments/pg-boss-worker-deployment.nix +++ b/nix/cardano-services/deployments/pg-boss-worker-deployment.nix @@ -66,8 +66,6 @@ key = "username"; }; }; - POSTGRES_SSL_STAKE_POOL = "true"; - POSTGRES_SSL_CA_FILE_STAKE_POOL = "/tls/ca.crt"; POSTGRES_POOL_MAX_DB_SYNC = "5"; POSTGRES_HOST_DB_SYNC = values.postgresName; @@ -85,21 +83,12 @@ key = "username"; }; }; - POSTGRES_SSL_DB_SYNC = "true"; - POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; } // lib.optionalAttrs (values.pg-boss-worker ? env) values.pg-boss-worker.env // lib.optionalAttrs (values.pg-boss-worker.metadata-fetch-mode == "smash") { SMASH_URL = values.pg-boss-worker.smash-url; }); - volumeMounts = [ - { - mountPath = "/tls"; - name = "tls"; - } - ]; }; - volumes.tls.secret.secretName = "postgresql-server-cert"; }; }; }; diff --git a/nix/cardano-services/deployments/projector.resource.nix b/nix/cardano-services/deployments/projector.resource.nix index a5f62f7e9cf..83ff70fde6f 100644 --- a/nix/cardano-services/deployments/projector.resource.nix +++ b/nix/cardano-services/deployments/projector.resource.nix @@ -79,15 +79,7 @@ in { runAsUser = 0; runAsGroup = 0; }; - - volumeMounts = [ - { - name = "tls"; - mountPath = "/tls"; - } - ]; }; - volumes.tls.secret.secretName = "postgresql-server-cert"; }; }; }; diff --git a/nix/cardano-services/deployments/provider.resource.nix b/nix/cardano-services/deployments/provider.resource.nix index 9383f53b21a..5ce9b296ce2 100644 --- a/nix/cardano-services/deployments/provider.resource.nix +++ b/nix/cardano-services/deployments/provider.resource.nix @@ -88,14 +88,7 @@ in { runAsGroup = 0; }; - volumeMounts = [ - { - name = "tls"; - mountPath = "/tls"; - } - ]; }; - volumes.tls.secret.secretName = "postgresql-server-cert"; }; }; }; diff --git a/nix/cardano-services/deployments/stake-pool.nix b/nix/cardano-services/deployments/stake-pool.nix index 57abf576be6..7f9725cc653 100644 --- a/nix/cardano-services/deployments/stake-pool.nix +++ b/nix/cardano-services/deployments/stake-pool.nix @@ -49,8 +49,6 @@ key = "username"; }; }; - POSTGRES_SSL_STAKE_POOL = "true"; - POSTGRES_SSL_CA_FILE_STAKE_POOL = "/tls/ca.crt"; }; }; @@ -90,8 +88,6 @@ key = "username"; }; }; - POSTGRES_SSL = "true"; - POSTGRES_SSL_CA_FILE = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/wallet-api.nix b/nix/cardano-services/deployments/wallet-api.nix index 874cf16bccb..8a97e445fef 100644 --- a/nix/cardano-services/deployments/wallet-api.nix +++ b/nix/cardano-services/deployments/wallet-api.nix @@ -40,8 +40,6 @@ key = "username"; }; }; - POSTGRES_SSL = "true"; - POSTGRES_SSL_CA_FILE = "/tls/ca.crt"; }; }; } diff --git a/nix/cardano-services/deployments/ws-server.deployment.nix b/nix/cardano-services/deployments/ws-server.deployment.nix index ac65ac51219..39eaf627dd8 100644 --- a/nix/cardano-services/deployments/ws-server.deployment.nix +++ b/nix/cardano-services/deployments/ws-server.deployment.nix @@ -67,17 +67,8 @@ key = "username"; }; }; - POSTGRES_SSL_DB_SYNC = "true"; - POSTGRES_SSL_CA_FILE_DB_SYNC = "/tls/ca.crt"; }; - volumeMounts = [ - { - mountPath = "/tls"; - name = "tls"; - } - ]; }; - volumes.tls.secret.secretName = "postgresql-server-cert"; }; }; };