From ad1162978219ade0c28e17610b74f66b73517387 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 3 Mar 2022 10:18:36 +0300
Subject: [PATCH] v5.4.3.0

Changelog: https://roxy-wi.org/changelog.py#5_4_3
---
 .../ansible/roles/docker/tasks/setup-RedHat.yml   |  8 ++++++++
 .../ansible/roles/nginx_common/tasks/main.yml     | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/scripts/ansible/roles/docker/tasks/setup-RedHat.yml b/app/scripts/ansible/roles/docker/tasks/setup-RedHat.yml
index d69b3d32..a4b47957 100644
--- a/app/scripts/ansible/roles/docker/tasks/setup-RedHat.yml
+++ b/app/scripts/ansible/roles/docker/tasks/setup-RedHat.yml
@@ -1,4 +1,12 @@
 ---
+- name: Ensure Podman is not installed.
+  package:
+    name:
+      - runc
+      - podman
+      - podman-catatonit
+    state: absent
+
 - name: Add Docker GPG key.
   rpm_key:
     key: "{{ docker_yum_gpg_key }}"
diff --git a/app/scripts/ansible/roles/nginx_common/tasks/main.yml b/app/scripts/ansible/roles/nginx_common/tasks/main.yml
index 250e7961..ab5f2d90 100644
--- a/app/scripts/ansible/roles/nginx_common/tasks/main.yml
+++ b/app/scripts/ansible/roles/nginx_common/tasks/main.yml
@@ -29,7 +29,7 @@
 - name: Set passlib version
   set_fact:
     passlib_ver: "python3-passlib"
-  when: (ansible_facts['distribution_major_version'] == '8' and (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS')) or (ansible_facts['os_family'] == 'Debian' or ansible_facts['os_family'] == 'Ubuntu')
+  when: ansible_facts['distribution_major_version'] == '8'
   ignore_errors: True
 
 
@@ -44,7 +44,18 @@
   package:
     name: "{{passlib_ver}}"
     state: present
-  when: "'nginx' not in ansible_facts.packages"
+  when:
+   - "'nginx' not in ansible_facts.packages"
+   - ansible_facts['distribution_major_version'] != '9'
+  environment:
+    http_proxy: "{{PROXY}}"
+    https_proxy: "{{PROXY}}"
+
+
+- name: Install passlib for el9
+  pip:
+    name: passlib
+  when: ansible_facts['distribution_major_version'] == '9'
   environment:
     http_proxy: "{{PROXY}}"
     https_proxy: "{{PROXY}}"