From 10db729a58d2f92c82df97f7aec39a3a789d67cf Mon Sep 17 00:00:00 2001
From: exitfound <loneri1437@gmail.com>
Date: Mon, 18 Dec 2023 23:54:46 +0200
Subject: [PATCH] Another little fix for some roles

---
 ansible/roles/docker-jenkins-agent/defaults/main.yaml | 2 +-
 ansible/roles/system-docker/tasks/debian.yaml         | 2 +-
 ansible/roles/system-docker/tasks/redhat.yaml         | 2 +-
 ansible/roles/system-docker/tasks/suse.yaml           | 2 +-
 ansible/roles/system-prepare/defaults/main.yaml       | 6 ------
 ansible/roles/system-prepare/tasks/debian.yaml        | 7 -------
 ansible/roles/system-prepare/tasks/redhat.yaml        | 7 -------
 ansible/roles/system-prepare/tasks/suse.yaml          | 7 -------
 8 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/ansible/roles/docker-jenkins-agent/defaults/main.yaml b/ansible/roles/docker-jenkins-agent/defaults/main.yaml
index 93dee44..905cccf 100644
--- a/ansible/roles/docker-jenkins-agent/defaults/main.yaml
+++ b/ansible/roles/docker-jenkins-agent/defaults/main.yaml
@@ -4,7 +4,7 @@
 
 docker_jenkins_agent_compose_file: "agent-docker-compose.yaml"
 docker_jenkins_agent_directory: "/opt/jenkins_agent_docker"
-docker_jenkins_agent_directory_mode: "u=rw,g=r,o=r"
+docker_jenkins_agent_directory_mode: "u=rwx,g=rx,o=r"
 docker_jenkins_agent_file_mode: "u=rw,g=r,o=r"
 docker_jenkins_agent_owner: "1000"
 docker_jenkins_agent_group: "1000"
diff --git a/ansible/roles/system-docker/tasks/debian.yaml b/ansible/roles/system-docker/tasks/debian.yaml
index c1a8a09..e2be96c 100644
--- a/ansible/roles/system-docker/tasks/debian.yaml
+++ b/ansible/roles/system-docker/tasks/debian.yaml
@@ -58,7 +58,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if Docker-compose is installed on Debian family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false
diff --git a/ansible/roles/system-docker/tasks/redhat.yaml b/ansible/roles/system-docker/tasks/redhat.yaml
index bbd58a1..27d4f3e 100644
--- a/ansible/roles/system-docker/tasks/redhat.yaml
+++ b/ansible/roles/system-docker/tasks/redhat.yaml
@@ -52,7 +52,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if docker-compose is installed on RedHat family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false
diff --git a/ansible/roles/system-docker/tasks/suse.yaml b/ansible/roles/system-docker/tasks/suse.yaml
index 3b04433..98d062f 100644
--- a/ansible/roles/system-docker/tasks/suse.yaml
+++ b/ansible/roles/system-docker/tasks/suse.yaml
@@ -33,7 +33,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if docker-compose is installed on SUSE family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false
diff --git a/ansible/roles/system-prepare/defaults/main.yaml b/ansible/roles/system-prepare/defaults/main.yaml
index b17ac30..3026de8 100644
--- a/ansible/roles/system-prepare/defaults/main.yaml
+++ b/ansible/roles/system-prepare/defaults/main.yaml
@@ -1,11 +1,5 @@
 ---
 
-# Переменные, необходимые для установки пакетов, применимые ко всем дистрибутивам в равной степени:
-
-pip_packages_list:
-  - docker
-  - docker-compose
-
 # Переменные, необходимые для установки пакетов на дистрибутиве семейства SUSE:
 
 opensuse_packages_list:
diff --git a/ansible/roles/system-prepare/tasks/debian.yaml b/ansible/roles/system-prepare/tasks/debian.yaml
index 9f5a474..9ecde74 100644
--- a/ansible/roles/system-prepare/tasks/debian.yaml
+++ b/ansible/roles/system-prepare/tasks/debian.yaml
@@ -14,10 +14,3 @@
     name: "{{ ubuntu_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on Debian family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3
diff --git a/ansible/roles/system-prepare/tasks/redhat.yaml b/ansible/roles/system-prepare/tasks/redhat.yaml
index c44078a..d6792c8 100644
--- a/ansible/roles/system-prepare/tasks/redhat.yaml
+++ b/ansible/roles/system-prepare/tasks/redhat.yaml
@@ -14,10 +14,3 @@
     name: "{{ centos_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on RedHat family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3
diff --git a/ansible/roles/system-prepare/tasks/suse.yaml b/ansible/roles/system-prepare/tasks/suse.yaml
index 2e85662..ba50a23 100644
--- a/ansible/roles/system-prepare/tasks/suse.yaml
+++ b/ansible/roles/system-prepare/tasks/suse.yaml
@@ -14,10 +14,3 @@
     name: "{{ opensuse_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on SUSE family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3