From 920359559970803c6fa49b6447e2f70e17f284ee Mon Sep 17 00:00:00 2001
From: Dmitriy Kuts <me@exileed.com>
Date: Sun, 7 Sep 2025 12:44:14 +0200
Subject: [PATCH] Support Debian 13

---
 .github/workflows/ci.yml | 1 +
 README.md                | 2 ++
 defaults/main.yml        | 1 +
 molecule/README.md       | 3 +++
 tasks/install_apt.yml    | 1 +
 tasks/main.yml           | 4 ++++
 tests/vars.Debian.13.yml | 1 +
 vars/Debian_22.yml       | 2 +-
 vars/trixie.yml          | 6 ++++++
 9 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/vars.Debian.13.yml
 create mode 100644 vars/trixie.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7738c2871..161829f11 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,6 +49,7 @@ jobs:
           # - distro: rockylinux9
           - distro: debian11
           - distro: debian12
+          - distro: debian13
           - distro: ubuntu2204
           - distro: ubuntu2404
 
diff --git a/README.md b/README.md
index fe3bba188..52606bf90 100644
--- a/README.md
+++ b/README.md
@@ -54,10 +54,12 @@ An example how to include this role as a task:
 
 #### Compatibility matrix
 
+
 | Distribution / PostgreSQL |     11     |     12     |         13         |         14         |         15         |         16         |        17          |
 | ------------------------- | :--------: | :--------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
 | Debian 11.x               | :no_entry: | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | Debian 12.x               | :no_entry: | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Debian 13.x               | :no_entry: | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | Rockylinux 8.x            | :no_entry: | :no_entry: |     :warning:      |     :warning:      |     :warning:      |     :warning:      |     :warning:      |
 | Rockylinux 9.x            | :no_entry: | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |     :warning:      |
 | Ubuntu 22.04.x            | :no_entry: | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
diff --git a/defaults/main.yml b/defaults/main.yml
index 689f285a6..64d71a090 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -838,6 +838,7 @@ postgresql_install_repository: true
 # APT settings
 postgresql_apt_key_id: "ACCC4CF8"
 postgresql_apt_key_url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
+postgresql_apt_repository_url: "https://apt.postgresql.org/pub/repos/apt"
 # postgresql_apt_keyring: "/usr/share/postgresql-common/pgdg/apt.postgresql.org.gpg"
 
 # repsoitory base
diff --git a/molecule/README.md b/molecule/README.md
index 27becf062..326b6ce51 100644
--- a/molecule/README.md
+++ b/molecule/README.md
@@ -14,6 +14,8 @@ The default distribution is ubuntu2204. You can override th with setting the env
 * fedora40
 * debian11
 * debian12
+=======
+* debian13
 * ubuntu2204
 * ubuntu2404
 
@@ -45,6 +47,7 @@ The playbooks read variables from two files. One common vars file, and one with
 $ ls -1 tests/ | grep vars
 vars.Debian.11.yml
 vars.Debian.12.yml
+vars.Debian.13.yml
 vars.Fedora.40.yml
 vars.Ubuntu.22.yml
 vars.Ubuntu.24.yml
diff --git a/tasks/install_apt.yml b/tasks/install_apt.yml
index 0a1b6b778..ff8fbb7cc 100644
--- a/tasks/install_apt.yml
+++ b/tasks/install_apt.yml
@@ -15,6 +15,7 @@
       - curl
       - gnupg
       - lsb-release
+      - python3-debian
     state: present
     update_cache: true
   when: ansible_facts['pkg_mgr'] == 'apt'
diff --git a/tasks/main.yml b/tasks/main.yml
index a9ce1524a..4a0d264e7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -30,6 +30,10 @@
         - "{{ role_path }}/vars"
   tags: [always]
 
+- name: Gather package facts
+  ansible.builtin.package_facts:
+    manager: apt
+
 # --- Installers par famille/distro ---
 - name: Install on APT-based systems
   ansible.builtin.import_tasks: install_apt.yml
diff --git a/tests/vars.Debian.13.yml b/tests/vars.Debian.13.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/tests/vars.Debian.13.yml
@@ -0,0 +1 @@
+---
diff --git a/vars/Debian_22.yml b/vars/Debian_22.yml
index 273f70e25..ca1d39422 100644
--- a/vars/Debian_22.yml
+++ b/vars/Debian_22.yml
@@ -3,4 +3,4 @@
 
 postgresql_service_name: "postgresql"
 
-postgresql_apt_repository: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main {{ postgresql_version }}"
+postgresql_apt_repository: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/postgresql.gpg] {{ postgresql_apt_repository_url }}/ {{ ansible_distribution_release }}-pgdg main {{ postgresql_version }}"
diff --git a/vars/trixie.yml b/vars/trixie.yml
new file mode 100644
index 000000000..2be91a931
--- /dev/null
+++ b/vars/trixie.yml
@@ -0,0 +1,6 @@
+---
+# PostgreSQL vars for Debian Trixie (13)
+
+postgresql_ext_postgis_deps:
+  - "postgresql-{{postgresql_version}}-postgis-3"
+  - "postgresql-{{postgresql_version}}-postgis-3-scripts"