From 4ec10a0643cdfa3624a5bac95c46c0fea199519e Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 10 Sep 2020 14:41:58 +0100 Subject: [PATCH 01/12] Add ssl config to example app for postgres --- .../create-app/templates/default-app/app-config.yaml.hbs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index bdd933e810..062b9b2e60 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -30,6 +30,12 @@ backend: password: $secret: env: POSTGRES_PASSWORD + ssl: + #ca: # if you have a CA file and want to verify it you can uncomment this section + # $secret: + # file: /ca/server.crt + $secret: + env: POSTGRES_SSL_OPTIONS {{/if}} proxy: From 39a5419fd75bf75f00d7df6786072606811c2492 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Fri, 11 Sep 2020 09:37:39 +0100 Subject: [PATCH 02/12] Rerun CI From 06b2c9ea6e92acd0ac517aad8e84b89310500728 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 08:42:41 +0100 Subject: [PATCH 03/12] Add docs link --- packages/create-app/templates/default-app/app-config.yaml.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 062b9b2e60..424b461392 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -30,6 +30,7 @@ backend: password: $secret: env: POSTGRES_PASSWORD + # https://node-postgres.com/features/ssl ssl: #ca: # if you have a CA file and want to verify it you can uncomment this section # $secret: From ec39c956a408a69cfc1a6e1081190db3dd1239ff Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 08:42:54 +0100 Subject: [PATCH 04/12] Restore app-config.yaml.hbs --- .../create-app/templates/default-app/app-config.yaml.hbs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 424b461392..bdd933e810 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -30,13 +30,6 @@ backend: password: $secret: env: POSTGRES_PASSWORD - # https://node-postgres.com/features/ssl - ssl: - #ca: # if you have a CA file and want to verify it you can uncomment this section - # $secret: - # file: /ca/server.crt - $secret: - env: POSTGRES_SSL_OPTIONS {{/if}} proxy: From cccdf8d32ae36888dd3cf162dc4885e9177c6d5b Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 08:43:59 +0100 Subject: [PATCH 05/12] Revert "Restore app-config.yaml.hbs" This reverts commit ec39c956a408a69cfc1a6e1081190db3dd1239ff. --- .../create-app/templates/default-app/app-config.yaml.hbs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index bdd933e810..424b461392 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -30,6 +30,13 @@ backend: password: $secret: env: POSTGRES_PASSWORD + # https://node-postgres.com/features/ssl + ssl: + #ca: # if you have a CA file and want to verify it you can uncomment this section + # $secret: + # file: /ca/server.crt + $secret: + env: POSTGRES_SSL_OPTIONS {{/if}} proxy: From 563d3b004dda157a5811524076bc738c0a8defb8 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 08:44:59 +0100 Subject: [PATCH 06/12] Update app-config.yaml.hbs --- packages/create-app/templates/default-app/app-config.yaml.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 424b461392..16a4fbaae5 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -15,6 +15,7 @@ backend: connection: ':memory:' {{/if}} {{#if dbTypePG}} + # config options: https://node-postgres.com/api/client database: client: pg connection: From 4fc24933b1e425045261a093817c2d72ead989c7 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 09:04:48 +0100 Subject: [PATCH 07/12] Update packages/create-app/templates/default-app/app-config.yaml.hbs --- packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 16a4fbaae5..57091b3d3a 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -37,7 +37,7 @@ backend: # $secret: # file: /ca/server.crt $secret: - env: POSTGRES_SSL_OPTIONS + env: POSTGRES_SSL_OPTIONS # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions {{/if}} proxy: From bd6ae84803e44dfc0ed141889a46fbf7c8aaea11 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 15 Sep 2020 21:35:45 +0100 Subject: [PATCH 08/12] Update packages/create-app/templates/default-app/app-config.yaml.hbs --- packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 57091b3d3a..b9ed7955fb 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -37,7 +37,7 @@ backend: # $secret: # file: /ca/server.crt $secret: - env: POSTGRES_SSL_OPTIONS # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions + env: POSTGRES_SSL_OPTIONS # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. POSTGRES_SSL_OPTIONS=require) {{/if}} proxy: From 17a304703bac798c64510e72e373102a7316b954 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Wed, 16 Sep 2020 07:13:06 +0100 Subject: [PATCH 09/12] Review feedback --- packages/create-app/templates/default-app/app-config.yaml.hbs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index b9ed7955fb..870b071701 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -32,12 +32,10 @@ backend: $secret: env: POSTGRES_PASSWORD # https://node-postgres.com/features/ssl - ssl: + ssl: prefer # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require) #ca: # if you have a CA file and want to verify it you can uncomment this section # $secret: # file: /ca/server.crt - $secret: - env: POSTGRES_SSL_OPTIONS # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. POSTGRES_SSL_OPTIONS=require) {{/if}} proxy: From 1928c46246a845a33ffa64b838c5553cc24678d6 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Wed, 16 Sep 2020 07:35:07 +0100 Subject: [PATCH 10/12] Try disable instead --- packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 870b071701..2f2472260d 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -32,7 +32,7 @@ backend: $secret: env: POSTGRES_PASSWORD # https://node-postgres.com/features/ssl - ssl: prefer # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require) + ssl: disable # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require) #ca: # if you have a CA file and want to verify it you can uncomment this section # $secret: # file: /ca/server.crt From 77a4102a1a6701377e9d2a46371c085b6f459288 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Wed, 16 Sep 2020 08:00:14 +0100 Subject: [PATCH 11/12] Comment out by default --- packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 2f2472260d..617be3052a 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -32,7 +32,7 @@ backend: $secret: env: POSTGRES_PASSWORD # https://node-postgres.com/features/ssl - ssl: disable # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require) + #ssl: require # see https://www.postgresql.org/docs/current/libpq-ssl.html Table 33.1. SSL Mode Descriptions (e.g. require) #ca: # if you have a CA file and want to verify it you can uncomment this section # $secret: # file: /ca/server.crt From 41940ca8859823f628898e2789a37497c4ddb14c Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Wed, 16 Sep 2020 08:36:55 +0100 Subject: [PATCH 12/12] Rerun CI