From fa5d5fe4ace37f898e787fa5d9c6b49d3529d579 Mon Sep 17 00:00:00 2001 From: mrsrvman Date: Mon, 13 Mar 2023 17:27:06 +0500 Subject: [PATCH 1/3] Ability to configure connection limits --- roles/postgresql-databases/tasks/main.yml | 5 +++-- roles/postgresql-users/tasks/main.yml | 2 +- vars/main.yml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/postgresql-databases/tasks/main.yml b/roles/postgresql-databases/tasks/main.yml index 4262044da..a7d2f0726 100644 --- a/roles/postgresql-databases/tasks/main.yml +++ b/roles/postgresql-databases/tasks/main.yml @@ -2,18 +2,19 @@ - name: Make sure the PostgreSQL databases are present become: true - become_user: postgres + become_user: "{{ patroni_superuser_username }}" postgresql_db: name: "{{ item.db }}" owner: "{{ item.owner }}" encoding: "{{ item.encoding }}" lc_collate: "{{ item.lc_collate }}" lc_ctype: "{{ item.lc_ctype }}" - template: "template0" + template: "{{ item.template | default('template0') }}" login_host: "127.0.0.1" login_port: "{{ postgresql_port }}" login_user: "{{ patroni_superuser_username }}" login_password: "{{ patroni_superuser_password }}" + conn_limit: "{{ item.conn_limit | default(omit) }}" state: present ignore_errors: true loop: "{{ postgresql_databases | flatten(1) }}" diff --git a/roles/postgresql-users/tasks/main.yml b/roles/postgresql-users/tasks/main.yml index 12f2f363d..18c105fe0 100644 --- a/roles/postgresql-users/tasks/main.yml +++ b/roles/postgresql-users/tasks/main.yml @@ -2,7 +2,7 @@ - name: Make sure the PostgreSQL users are present become: true - become_user: postgres + become_user: "{{ patroni_superuser_username }}" postgresql_user: name: "{{ item.name }}" password: "{{ item.password }}" diff --git a/vars/main.yml b/vars/main.yml index 0b96d968a..6e3b55849 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -148,6 +148,7 @@ postgresql_users: [] # (optional) list of databases to be created (if not already exists) postgresql_databases: [] # - { db: "mydatabase", encoding: "UTF8", lc_collate: "ru_RU.UTF-8", lc_ctype: "ru_RU.UTF-8", owner: "mydb-user" } +# - { db: "mydatabase2", encoding: "UTF8", lc_collate: "ru_RU.UTF-8", lc_ctype: "ru_RU.UTF-8", owner: "mydb-user", conn_limit: "50" } # - { db: "", encoding: "UTF8", lc_collate: "en_US.UTF-8", lc_ctype: "en_US.UTF-8", owner: "" } # - { db: "", encoding: "UTF8", lc_collate: "en_US.UTF-8", lc_ctype: "en_US.UTF-8", owner: "" } From 6a7f54255fa7723b45487dd68ff8bdf1cfd5ffc5 Mon Sep 17 00:00:00 2001 From: mrsrvman Date: Wed, 15 Mar 2023 00:36:43 +0500 Subject: [PATCH 2/3] Update main.yml --- roles/postgresql-databases/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/postgresql-databases/tasks/main.yml b/roles/postgresql-databases/tasks/main.yml index a7d2f0726..95d389060 100644 --- a/roles/postgresql-databases/tasks/main.yml +++ b/roles/postgresql-databases/tasks/main.yml @@ -2,7 +2,7 @@ - name: Make sure the PostgreSQL databases are present become: true - become_user: "{{ patroni_superuser_username }}" + become_user: postgres postgresql_db: name: "{{ item.db }}" owner: "{{ item.owner }}" From 8b4f7368c507bfb9ea827374ccc786a06a3293c5 Mon Sep 17 00:00:00 2001 From: mrsrvman Date: Wed, 15 Mar 2023 00:37:22 +0500 Subject: [PATCH 3/3] Partial revert --- roles/postgresql-users/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/postgresql-users/tasks/main.yml b/roles/postgresql-users/tasks/main.yml index 18c105fe0..12f2f363d 100644 --- a/roles/postgresql-users/tasks/main.yml +++ b/roles/postgresql-users/tasks/main.yml @@ -2,7 +2,7 @@ - name: Make sure the PostgreSQL users are present become: true - become_user: "{{ patroni_superuser_username }}" + become_user: postgres postgresql_user: name: "{{ item.name }}" password: "{{ item.password }}"