ssl_by_default: remove stray PG10 check

pull/3101/head
Philip Dubé 2019-10-22 18:28:37 +00:00 committed by Philip Dubé
parent 2204a17dbd
commit 2a969fe4bb
2 changed files with 6 additions and 28 deletions

View File

@ -3,22 +3,11 @@
-- To test this we will verify that SSL is set to ON for all machines, and we will make
-- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and
-- lastly we will inspect the ssl state for connections to the workers
-- ssl can only be enabled by default on installations of postgres 10 and above that are
-- OpenSSL-enabled.
SHOW server_version \gset
-- ssl can only be enabled by default on installations that are OpenSSL-enabled.
SHOW ssl_ciphers \gset
WITH features AS (
SELECT
substring(:'server_version', '\d+')::int >= 10 AS version_ten_or_above,
:'ssl_ciphers' != 'none' AS hasssl
)
SELECT (
true
AND version_ten_or_above
AND hasssl
) AS ssl_by_default_supported FROM features;
ssl_by_default_supported
--------------------------
SELECT :'ssl_ciphers' != 'none' AS hasssl;
hasssl
--------
t
(1 row)

View File

@ -5,20 +5,9 @@
-- sure connections to workers use SSL by having it required in citus.conn_nodeinfo and
-- lastly we will inspect the ssl state for connections to the workers
-- ssl can only be enabled by default on installations of postgres 10 and above that are
-- OpenSSL-enabled.
SHOW server_version \gset
-- ssl can only be enabled by default on installations that are OpenSSL-enabled.
SHOW ssl_ciphers \gset
WITH features AS (
SELECT
substring(:'server_version', '\d+')::int >= 10 AS version_ten_or_above,
:'ssl_ciphers' != 'none' AS hasssl
)
SELECT (
true
AND version_ten_or_above
AND hasssl
) AS ssl_by_default_supported FROM features;
SELECT :'ssl_ciphers' != 'none' AS hasssl;
SHOW ssl;
SELECT run_command_on_workers($$