From f8e5f0cc767fdc33c3f809c0fdf8835d37c96cd0 Mon Sep 17 00:00:00 2001
From: Solal Nathan <otthorn@crans.org>
Date: Sun, 14 Mar 2021 23:56:07 +0100
Subject: [PATCH] Manually cherrypicked from 65c94d8e84

---
 host_vars/bdd.adm.auro.re     |  8 ------
 host_vars/bdd.adm.auro.re.yml | 47 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 8 deletions(-)
 delete mode 100644 host_vars/bdd.adm.auro.re
 create mode 100644 host_vars/bdd.adm.auro.re.yml

diff --git a/host_vars/bdd.adm.auro.re b/host_vars/bdd.adm.auro.re
deleted file mode 100644
index d1e9353..0000000
--- a/host_vars/bdd.adm.auro.re
+++ /dev/null
@@ -1,8 +0,0 @@
-postgresql:
-  version: 11
-  hosts: # dbname, username, CIDR ip addr, auth method
-  - [ "nextcloud", "nextcloud", "10.128.0.58", "md5" ]
-  - [ "gitea", "gitea", "10.128.0.60", "md5" ]
-  - [ "drone", "drone", "10.128.0.64", "md5" ]
-  - [ "wikijs", "wikijs", "10.128.0.66", "md5" ]
-  - [ "vote", "vote", "10.128.0.81", "md5" ]
diff --git a/host_vars/bdd.adm.auro.re.yml b/host_vars/bdd.adm.auro.re.yml
new file mode 100644
index 0000000..e844a5a
--- /dev/null
+++ b/host_vars/bdd.adm.auro.re.yml
@@ -0,0 +1,47 @@
+---
+postgresql:
+  version: 13
+postgresql_hosts:
+  - database: nextcloud
+    user: nextcloud
+    net: 10.128.0.58/32
+    method: md5
+  - database: gitea
+    user: gitea
+    net: 10.128.0.60/32
+    method: md5
+  - database: wikijs
+    user: wikijs
+    net: 10.128.0.66/32
+    method: md5
+  - database: drone
+    user: drone
+    net: 10.128.0.64/32
+    method: md5
+postgresql_databases:
+  - nextcloud
+  - gitea
+  - wikijs
+  - drone
+postgresql_users:
+  - name: nextcloud
+    database: nextcloud
+    password: "{{ postgresql_nextcloud_passwd }}"
+    privs:
+      - ALL
+  - name: gitea
+    database: gitea
+    password: "{{ postgresql_gitea_passwd }}"
+    privs:
+      - ALL
+  - name: wikijs
+    database: wikijs
+    password: "{{ postgresql_wikijs_passwd }}"
+    privs:
+      - ALL
+  - name: drone
+    database: drone
+    password: "{{ postgresql_drone_passwd }}"
+    privs:
+      - ALL
+...