From 991e2d16943e65bbe877e99240965cdd608a4244 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 6 Oct 2023 14:34:08 +1100 Subject: [PATCH 1/4] Uninstall conflicting packages on CI We couldn't install all our dependencies because of conflicting versions: ``` The following packages have unmet dependencies: libgd-dev : Depends: libgd3 (= 2.2.5-5.2ubuntu2.1) but 2.3.3-9+ubuntu20.04.1+deb.sury.org+1 is to be installed ``` --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f72096544..00ded0a64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,5 +48,8 @@ jobs: ${{ runner.os }}-ruby- ${{ runner.os }}- + - name: Uninstall conflicting packages + run: sudo apt remove nginx libgd3 + - name: Test Playbooks run: ansible-playbook tests/suite.yml --limit test --connection local From 4432994291b21beebf88f5cfe10d27059d4bd224 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Mon, 9 Oct 2023 15:09:52 +1100 Subject: [PATCH 2/4] Bump jdauphant.nginx from v2.8.1 to v2.21.2 This is actually unrelated. I mixed up roles while updating a dependency but it doesn't hurt to stay up-to-date. So I keep this commit in. --- bin/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/requirements.yml b/bin/requirements.yml index 6d2150426..516f64a40 100644 --- a/bin/requirements.yml +++ b/bin/requirements.yml @@ -6,7 +6,7 @@ version: 3.4.2 - src: jdauphant.nginx - version: v2.8.1 + version: v2.21.2 - src: coopdevs.certbot_nginx version: v0.3.0 From 44d6496987a3ef3d9bca4dcad3436c6dc16aa9aa Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Mon, 9 Oct 2023 15:44:59 +1100 Subject: [PATCH 3/4] Bump geerlingguy.postgresql from 3.4.0 to 3.5.0 Hopefully the new version will create postgres users with the defined permission to create databases. --- bin/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/requirements.yml b/bin/requirements.yml index 516f64a40..023c94b0c 100644 --- a/bin/requirements.yml +++ b/bin/requirements.yml @@ -15,7 +15,7 @@ version: v2.0.14 - src: geerlingguy.postgresql - version: 3.4.0 + version: 3.5.0 - src: libre-ops.multi_redis version: 1.0.1 From d9b11f22f5f20c73dafc2fa38c16bfcc2d5558ff Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Mon, 9 Oct 2023 15:59:21 +1100 Subject: [PATCH 4/4] Allow database user to create databases Since we are importing only parts of another role, we missed to include this new part after some update. This should give the database user the permission to create its database again. --- roles/dbserver/tasks/postgresql.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/dbserver/tasks/postgresql.yml b/roles/dbserver/tasks/postgresql.yml index 09652545c..225033c52 100644 --- a/roles/dbserver/tasks/postgresql.yml +++ b/roles/dbserver/tasks/postgresql.yml @@ -33,3 +33,12 @@ login_password: "{{ db_password }}" lc_collate: "{{ postgres_encoding }}" lc_ctype: "{{ postgres_encoding }}" + +- include_role: + name: geerlingguy.postgresql + tasks_from: users_props + vars: + postgresql_user: postgres + postgresql_users: + - name: "{{ db_user }}" + role_attr_flags: "{{ db_user_roles }}"