From 125d4c6118bf960bacdeb6d1b3bbc6e3ed600ae1 Mon Sep 17 00:00:00 2001 From: Matteo Gioioso Date: Mon, 25 Apr 2022 11:03:22 +0300 Subject: [PATCH 1/2] Update entrypoint script add support for ssl_ca_cert --- pgpool.docker/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pgpool.docker/entrypoint.sh b/pgpool.docker/entrypoint.sh index 4bb362b..8d591a5 100755 --- a/pgpool.docker/entrypoint.sh +++ b/pgpool.docker/entrypoint.sh @@ -167,6 +167,7 @@ function generate_certs() { echo -e "\n" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf echo "ssl_key = '${PGPOOL_INSTALL_DIR}/tls/tls.key'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf echo "ssl_cert = '${PGPOOL_INSTALL_DIR}/tls/tls.crt'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf + echo "ssl_ca_cert = '${PGPOOL_INSTALL_DIR}/tls/root.crt'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf } validate_pgpool_settings() { From ffbb421787a7432f5eb60d5712e9c861df120d0f Mon Sep 17 00:00:00 2001 From: mgioioso Date: Sat, 16 Jul 2022 10:29:57 +0300 Subject: [PATCH 2/2] updat entrypoint script if user does not provide root.crt we will not write the paramenter in pgpool.conf --- pgpool.docker/entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pgpool.docker/entrypoint.sh b/pgpool.docker/entrypoint.sh index 8d591a5..0ff9700 100755 --- a/pgpool.docker/entrypoint.sh +++ b/pgpool.docker/entrypoint.sh @@ -167,7 +167,10 @@ function generate_certs() { echo -e "\n" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf echo "ssl_key = '${PGPOOL_INSTALL_DIR}/tls/tls.key'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf echo "ssl_cert = '${PGPOOL_INSTALL_DIR}/tls/tls.crt'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf - echo "ssl_ca_cert = '${PGPOOL_INSTALL_DIR}/tls/root.crt'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf + + if [[ -f "${PGPOOL_INSTALL_DIR}/tls/root.crt" ]]; then + echo "ssl_ca_cert = '${PGPOOL_INSTALL_DIR}/tls/root.crt'" >> ${PGPOOL_INSTALL_DIR}/etc/pgpool.conf + fi } validate_pgpool_settings() {