From f45491ce0b8bee713d20329e81e55572d74593c9 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Fri, 28 Jan 2022 21:00:08 +0100
Subject: [PATCH] Update to 2022-01-28 21:00

---
 roles/matrix_synapse/defaults/main.yml |  2 +-
 roles/matrix_synapse/meta/main.yml     |  6 ++++++
 roles/matrix_synapse/tasks/install.yml | 13 +++++--------
 roles/matrix_synapse/vars/RedHat-7.yml |  8 ++++----
 roles/matrix_synapse/vars/RedHat-8.yml |  8 ++++----
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml
index 8e7f882..c362b51 100644
--- a/roles/matrix_synapse/defaults/main.yml
+++ b/roles/matrix_synapse/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Synapse version to deploy
-synapse_version: 1.49.2
+synapse_version: 1.51.0
 
 # Should ansible handle Synapse upgrades ? If false, only initial install will be done
 synapse_manage_upgrade: True
diff --git a/roles/matrix_synapse/meta/main.yml b/roles/matrix_synapse/meta/main.yml
index ed97d53..0cc102d 100644
--- a/roles/matrix_synapse/meta/main.yml
+++ b/roles/matrix_synapse/meta/main.yml
@@ -1 +1,7 @@
 ---
+
+dependencies:
+  - role: repo_scl # Require python > 3.6
+    when:
+      - ansible_os_family == 'RedHat'
+      - ansible_distribution_major_version is version('8', '<')
diff --git a/roles/matrix_synapse/tasks/install.yml b/roles/matrix_synapse/tasks/install.yml
index fb324ef..bb15908 100644
--- a/roles/matrix_synapse/tasks/install.yml
+++ b/roles/matrix_synapse/tasks/install.yml
@@ -27,12 +27,10 @@
   when: synapse_install_mode == 'upgrade'
   tags: matrix
 
-- name: Install or update dependencies in the virtual env
+- name: Install dependencies in the virtual env
   pip:
-    state: "{{ (synapse_install_mode == 'upgrade') | ternary('latest','present') }}"
     virtualenv: "{{ synapse_root_dir }}/venv"
-    virtualenv_command: /usr/bin/virtualenv-3
-    virtualenv_python: /usr/bin/python3
+    virtualenv_command: "{{ synapse_python }} -m venv"
     name:
       - bleach
       - matrix-synapse-ldap3
@@ -48,11 +46,10 @@
   notify: restart synapse
   tags: matrix
 
-- name: Install or update synapse in a virtualenv
+- name: Install synapse in the virtualenv
   pip:
     virtualenv: "{{ synapse_root_dir }}/venv"
-    virtualenv_command: /usr/bin/virtualenv-3
-    virtualenv_python: /usr/bin/python3
+    virtualenv_command: "{{ synapse_python }} -m venv"
     name:
       - matrix-synapse
     version: "{{ synapse_version }}"
@@ -73,7 +70,7 @@
 - name: Install REST auth module
   get_url:
     url: https://raw.githubusercontent.com/ma1uta/matrix-synapse-rest-password-provider/master/rest_auth_provider.py
-    dest: "{{ synapse_root_dir }}/venv/lib/python3.6/site-packages/"
+    dest: "{{ synapse_venv_lib_dir }}"
   tags: matrix
 
 - name: Create the PostgreSQL role
diff --git a/roles/matrix_synapse/vars/RedHat-7.yml b/roles/matrix_synapse/vars/RedHat-7.yml
index b2c7dff..f967275 100644
--- a/roles/matrix_synapse/vars/RedHat-7.yml
+++ b/roles/matrix_synapse/vars/RedHat-7.yml
@@ -21,9 +21,9 @@ synapse_packages:
   - postgresql-devel
   - libpqxx-devel
   - jemalloc
-  - python3-virtualenv
-  - python3-pip
-  - python-psycopg2
-  - python-setuptools
+  - rh-python38-python-pip
+  - rh-python38-python-devel
 
 synapse_jemalloc: /usr/lib64/libjemalloc.so.1
+synapse_python: /opt/rh/rh-python38/root/usr/bin/python
+synapse_venv_lib_dir: "{{ synapse_root_dir }}/venv/lib/python3.8/site-packages/"
diff --git a/roles/matrix_synapse/vars/RedHat-8.yml b/roles/matrix_synapse/vars/RedHat-8.yml
index ac28bc1..24ef8a4 100644
--- a/roles/matrix_synapse/vars/RedHat-8.yml
+++ b/roles/matrix_synapse/vars/RedHat-8.yml
@@ -20,9 +20,9 @@ synapse_packages:
   - postgresql14
   - postgresql-devel
   - jemalloc
-  - python3-virtualenv
-  - python3-pip
-  - python3-psycopg2
-  - python3-setuptools
+  - python39-pip
+  - python39-devel
 
 synapse_jemalloc: /usr/lib64/libjemalloc.so.2
+synapse_python: /usr/bin/python3.9
+synapse_venv_lib_dir: "{{ synapse_root_dir }}/venv/lib/python3.9/site-packages/"