From fe137b0a4c2ff9842fa9072e402895e85bba47cf Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 15 Mar 2021 14:28:54 +0100
Subject: [PATCH 1/3] postgres: remove py2 package install for bullseye

---
 postgres/tasks/main.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/postgres/tasks/main.yml b/postgres/tasks/main.yml
index eb4549f..072133b 100644
--- a/postgres/tasks/main.yml
+++ b/postgres/tasks/main.yml
@@ -19,11 +19,17 @@
     name:
       # yamllint disable-line rule:line-length
       - postgresql{{ "-{}".format(postgres_version) if postgres_version is defined }}
-      - python-psycopg2
       - python3-psycopg2
       - libpq-dev
     state: present
 
+- name: ensure legacy postgres packages are installed
+  apt:
+    name:
+      - python-psycopg2
+    state: present
+  when: ansible_distribution_major_version|int(default=99) < 11
+
 - name: ensure postgres is started
   service:
     name: postgresql
-- 
GitLab


From 2063e368ec7a79a4ce956f49b480a26d73050f2d Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 15 Mar 2021 14:29:18 +0100
Subject: [PATCH 2/3] mysql: remove py2 package install for bullseye

---
 mysql/tasks/main.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index cf65cb7..c5a4a9f 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -5,12 +5,19 @@
   apt:
     name:
       - mariadb-server
-      - python-mysqldb
+      - python3-mysqldb
     state: present
   tags:
     - packages
     - mysql
 
+- name: ensure legacy mysql packages are installed
+  apt:
+    name:
+      - python-mysqldb
+    state: present
+  when: ansible_distribution_major_version|int(default=99) < 11
+
 - name: ensure mysql is started
   service:
     name: mysql
-- 
GitLab


From 4a483e42babf7b72af5c359f1a229d1153b58824 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 15 Mar 2021 14:29:52 +0100
Subject: [PATCH 3/3] postgres: add backup script compat for bullseye

---
 postgres/files/pgbackup-bullseye.sh | 9 +++++++++
 postgres/tasks/main.yml             | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 postgres/files/pgbackup-bullseye.sh

diff --git a/postgres/files/pgbackup-bullseye.sh b/postgres/files/pgbackup-bullseye.sh
new file mode 100755
index 0000000..06c8e98
--- /dev/null
+++ b/postgres/files/pgbackup-bullseye.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for DB in $(sudo -u postgres psql -t -q -A -c "select datname from pg_catalog.pg_database where not datname like 'template%';")
+do
+	sudo -u postgres pg_dump $DB | gzip -c -- > ${DB}.sql.gz
+done
+
+sudo -u postgres pg_dumpall -g -U postgres | gzip -c -- > pg_dumpall.sql.gz
+
diff --git a/postgres/tasks/main.yml b/postgres/tasks/main.yml
index 072133b..1867e9c 100644
--- a/postgres/tasks/main.yml
+++ b/postgres/tasks/main.yml
@@ -38,8 +38,8 @@
 
 - name: ensure we have our postgres backup script
   copy:
-    src: pgbackup.sh
-    dest: /usr/local/bin/
+    src: "pgbackup{{ '-bullseye' if ansible_distribution_major_version|int(default=99) > 10 else '' }}.sh"
+    dest: /usr/local/bin/pgbackup.sh
     owner: root
     group: root
     mode: '0755'
-- 
GitLab