From 5e7d772c2b2df94781051d1b6c47fb5761c4940f Mon Sep 17 00:00:00 2001
From: mpavlov <mpavlov@olsson.ul>
Date: Fri, 27 Sep 2024 22:46:41 +0300
Subject: [PATCH 1/5] added ansible.cfg

---
 ansible.cfg | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 ansible.cfg

diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 0000000..4e4796a
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,6 @@
+[defaults]
+hostfile = hosts.ini
+log_path = ansible-log.log
+host_key_checking = false
+interpreter_python = /usr/bin/python3
+forks = 30
\ No newline at end of file

From 9a5dde1e010a8ae2e306ff02b35936f6e6672cdf Mon Sep 17 00:00:00 2001
From: mpavlov <mpavlov@olsson.ul>
Date: Fri, 27 Sep 2024 22:53:19 +0300
Subject: [PATCH 2/5] more info in jenkinsfile

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 70c19d7..9a72b63 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,9 +8,9 @@ pipeline {
         base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')")
         base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')")
         booleanParam(name: "config_add", defaultValue: true, description: "Add config")
-        string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (for 'Add config' job only)")
-        string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port (for 'Add config' job only)")
-        string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address (for 'Add config' job only)")
+        string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name, ex: jenkins (for 'Add config' job only)")
+        string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port, ex: 8080 (for 'Add config' job only)")
+        string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address, ex: 10.10.10.10 (for 'Add config' job only)")
 
     }
     stages {

From 309c0b582642c2449fca37a8e81ad351f7f403e5 Mon Sep 17 00:00:00 2001
From: mpavlov <mpavlov@olsson.ul>
Date: Fri, 27 Sep 2024 23:11:29 +0300
Subject: [PATCH 3/5] added debug and rhel block

---
 roles/rproxy/tasks/main.yml | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/roles/rproxy/tasks/main.yml b/roles/rproxy/tasks/main.yml
index 04abdb4..5334305 100644
--- a/roles/rproxy/tasks/main.yml
+++ b/roles/rproxy/tasks/main.yml
@@ -1,4 +1,9 @@
 ---
+
+- name: Debug
+  ansible.builtin.debug:
+    msg: "{{ ansible_facts['os_family'] }}"
+
 - name: Get domain
   ansible.builtin.shell:
     cmd: hostname -d
@@ -7,7 +12,7 @@
     - install
     - add_config
 
-- name: Install dependencies (Debian)
+- name: Install docker (Debian)
   ansible.builtin.apt:
     name:
       - docker.io
@@ -15,19 +20,21 @@
     update_cache: yes
   when: ansible_facts['os_family'] == "Debian"
 
-- name: Install dependencies (RHEL)
-  ansible.builtin.pip:
-    name: 
-      - docker
-      - docker-compose
-  when: ansible_facts['os_family'] == "RedHat"
+- name: Install dependencies RHEL
+  block:
+    - name: Install docker (RHEL)
+      ansible.builtin.pip:
+        name: 
+          - docker
+          - docker-compose
+      when: ansible_facts['os_family'] == "RedHat"
 
-- name: Enable docker (RHEL)
-  ansible.builtin.systemd:
-    name: docker
-    state: restarted
-    enabled: true
-    daemon_reload: true
+    - name: Enable docker (RHEL)
+      ansible.builtin.systemd:
+        name: docker
+        state: restarted
+        enabled: true
+        daemon_reload: true
   when: ansible_facts['os_family'] == "RedHat"
 
 - name: Install rproxy

From 192ab49d37acc4eb4a60b438e4cd03592b0ee627 Mon Sep 17 00:00:00 2001
From: mpavlov <mpavlov@olsson.ul>
Date: Fri, 27 Sep 2024 23:16:53 +0300
Subject: [PATCH 4/5] tag added

---
 roles/rproxy/tasks/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/rproxy/tasks/main.yml b/roles/rproxy/tasks/main.yml
index 5334305..ced1e73 100644
--- a/roles/rproxy/tasks/main.yml
+++ b/roles/rproxy/tasks/main.yml
@@ -19,6 +19,7 @@
       - docker-compose
     update_cache: yes
   when: ansible_facts['os_family'] == "Debian"
+  tags: install
 
 - name: Install dependencies RHEL
   block:
@@ -36,6 +37,7 @@
         enabled: true
         daemon_reload: true
   when: ansible_facts['os_family'] == "RedHat"
+  tags: install
 
 - name: Install rproxy
   block:

From 199364e1ac98529618e6915c69a3ba8a0d6980be Mon Sep 17 00:00:00 2001
From: mpavlov <mpavlov@olsson.ul>
Date: Fri, 27 Sep 2024 23:19:01 +0300
Subject: [PATCH 5/5] done

---
 roles/rproxy/tasks/main.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/roles/rproxy/tasks/main.yml b/roles/rproxy/tasks/main.yml
index ced1e73..6fc787c 100644
--- a/roles/rproxy/tasks/main.yml
+++ b/roles/rproxy/tasks/main.yml
@@ -1,9 +1,4 @@
 ---
-
-- name: Debug
-  ansible.builtin.debug:
-    msg: "{{ ansible_facts['os_family'] }}"
-
 - name: Get domain
   ansible.builtin.shell:
     cmd: hostname -d