#319 allow configurable Postgres authentication

gdcc · Sep 13, 2023 · b7c827d · b7c827d
1 parent c06a7b0
commit b7c827d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -265,6 +265,7 @@ build_guides: false
 db:
   postgres:
     enabled: true
+    auth: scram-sha-256
     adminpass: DVn33dsth1s
     name: dvndb
     host: localhost

diff --git a/templates/pg_hba.conf.j2 b/templates/pg_hba.conf.j2
@@ -1,9 +1,9 @@
 # "local" is for Unix domain socket connections only
-local   all             all                                     trust
+local   all             all                                     {{ db.postgres.auth }}
 # IPv4 local connections:
-host    all             all             127.0.0.1/32            password
+host    all             all             127.0.0.1/32            {{ db.postgres.auth }}
 # IPv6 local connections:
-host    all             all             ::1/128                 password
+host    all             all             ::1/128                 {{ db.postgres.auth }}
 
 # replication and dataverse access from other servers
 {% if db.postgres.replication.enabled is defined %}

diff --git a/tests/group_vars/jenkins.yml b/tests/group_vars/jenkins.yml
@@ -256,6 +256,7 @@ db:
   postgres:
     enabled: true
     adminpass: DVn33dsth1s
+    auth: scram-sha-256
     name: dvndb
     host: localhost
     user: dvnuser

diff --git a/tests/group_vars/memorytests.yml b/tests/group_vars/memorytests.yml
@@ -258,6 +258,7 @@ db:
   postgres:
     enabled: true
     adminpass: DVn33dsth1s
+    auth: scram-sha-256
     name: dvndb
     host: localhost
     user: dvnuser

diff --git a/tests/group_vars/vagrant.yml b/tests/group_vars/vagrant.yml
@@ -259,6 +259,7 @@ build_guides: false
 db:
   postgres:
     enabled: true
+    auth: trust
     adminpass: DVn33dsth1s
     name: vagrantdb
     host: localhost