From e301d6859cd66b1617b35eae8f04c9604fa2fbec Mon Sep 17 00:00:00 2001 From: Marc Bachmann Date: Mon, 20 Feb 2023 16:16:17 +0100 Subject: [PATCH] chore: Fix odyssey Dockerfile example --- odyssey/Dockerfile | 2 +- odyssey/odyssey.conf | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/odyssey/Dockerfile b/odyssey/Dockerfile index f21b281..8d4ad92 100644 --- a/odyssey/Dockerfile +++ b/odyssey/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t livingdocs/odyssey:1.3 . -f debian.Dockerfile +# docker build -t livingdocs/odyssey:1.3 . -f Dockerfile # docker run --rm -p 6543:6543 livingdocs/odyssey:1.3 FROM debian:bullseye as builder RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/odyssey/odyssey.conf b/odyssey/odyssey.conf index 88ec473..ef0b0b8 100644 --- a/odyssey/odyssey.conf +++ b/odyssey/odyssey.conf @@ -8,24 +8,14 @@ storage "primary" { } database "console" { - user "pooler" { - authentication "scram-sha-256" - pool "session" - storage "local" - - auth_query "SELECT * from pooler.lookup_user($1)" - auth_query_db "auth-query" - auth_query_user "pooler" - } - - user "postgres" { + user default { authentication "scram-sha-256" pool "session" storage "local" auth_query "SELECT * from pooler.lookup_user($1)" - auth_query_db "auth-query" - auth_query_user "pooler" + auth_query_db "auth-query" + auth_query_user "pooler" } } @@ -42,13 +32,13 @@ database "auth-query" { database default { user default { storage "primary" - authentication "scram-sha-256" + authentication "scram-sha-256" # This requires you to create the pooler schema and the lookup function. # An example is provided in setup_password_lookup_function.sql auth_query "SELECT * from pooler.lookup_user($1)" - auth_query_db "auth-query" - auth_query_user "pooler" + auth_query_db "auth-query" + auth_query_user "pooler" pool "transaction" pool_size 0