Moving the calls to postgresql_tls_auth_configuration to be consistent on startup (#258)

This commit is contained in:
JonEngle
2020-11-17 23:55:44 -08:00
committed by GitHub
parent c7dd4dbac9
commit bb7b6a37a5
5 changed files with 10 additions and 15 deletions

View File

@@ -636,10 +636,9 @@ postgresql_initialize() {
is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls
postgresql_configure_recovery
fi
# TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file
is_boolean_yes "$create_pghba_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_tls_auth_configuration
fi
# TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file
is_boolean_yes "$create_pghba_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_tls_auth_configuration
is_boolean_yes "$create_conf_file" && [[ -n "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]] && postgresql_set_property "shared_preload_libraries" "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
is_boolean_yes "$create_conf_file" && postgresql_configure_logging
is_boolean_yes "$create_conf_file" && postgresql_configure_connections