From 96390a2d465976ea7679f30512fd51d83f01d814 Mon Sep 17 00:00:00 2001 From: manuasir Date: Wed, 19 Dec 2018 10:22:40 +0100 Subject: [PATCH 1/3] Installing apt packages concurrently, related #109 --- .../ansible-elasticsearch/tasks/Debian.yml | 8 +++---- .../ansible-kibana/tasks/Debian.yml | 8 +++---- .../ansible-logstash/tasks/Debian.yml | 8 +++---- roles/wazuh/ansible-filebeat/tasks/Debian.yml | 9 ++++---- .../ansible-wazuh-agent/tasks/Debian.yml | 22 ++++++++----------- .../ansible-wazuh-manager/tasks/Debian.yml | 8 +++---- 6 files changed, 25 insertions(+), 38 deletions(-) diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml index ae4e717f..2cfcc77b 100644 --- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml @@ -1,12 +1,10 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates - when: elasticsearch_install_java block: diff --git a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml index 9cb809d2..733b222c 100644 --- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml @@ -1,12 +1,10 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates - name: Debian/Ubuntu | Add Elasticsearch GPG key apt_key: diff --git a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml index 628fd8e4..9d0cd4b5 100644 --- a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml @@ -1,12 +1,10 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates - when: logstash_install_java block: diff --git a/roles/wazuh/ansible-filebeat/tasks/Debian.yml b/roles/wazuh/ansible-filebeat/tasks/Debian.yml index 45494c26..32fab13e 100644 --- a/roles/wazuh/ansible-filebeat/tasks/Debian.yml +++ b/roles/wazuh/ansible-filebeat/tasks/Debian.yml @@ -1,12 +1,11 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates + - name: Debian/Ubuntu | Add Elasticsearch apt key. apt_key: diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index d8affe84..b11b846a 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -1,12 +1,10 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates - name: Debian/Ubuntu | Installing repository key apt_key: url=https://packages.wazuh.com/key/GPG-KEY-WAZUH @@ -49,15 +47,13 @@ - name: Debian/Ubuntu | Install OpenScap apt: - name: "{{ item }}" state: present - cache_valid_time: 3600 - when: wazuh_agent_config.openscap.disable == 'no' - with_items: - - libopenscap8 - - xsltproc - tags: - - init + when: wazuh_agent_config.openscap.disable == 'no' + pkg: + - libopenscap8 + - xsltproc + tags: + - init - name: Debian/Ubuntu | Get OpenScap installed version shell: "dpkg-query --showformat='${Version}' --show libopenscap8" diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index f2885345..9905b238 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -1,12 +1,10 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - name: "{{ item }}" + pkg: + - apt-transport-https + - ca-certificates state: present - cache_valid_time: 3600 - with_items: - - apt-transport-https - - ca-certificates - name: Debian/Ubuntu | Installing Wazuh repository key apt_key: url=https://packages.wazuh.com/key/GPG-KEY-WAZUH From a9344cf18180d91da8b3c86e5843f34ddd6e088a Mon Sep 17 00:00:00 2001 From: l Date: Mon, 1 Apr 2019 12:23:48 +0200 Subject: [PATCH 2/3] Using list instead of iterating over one to install packages --- .../elastic-stack/ansible-elasticsearch/tasks/Debian.yml | 4 +--- roles/elastic-stack/ansible-logstash/tasks/Debian.yml | 4 +--- roles/wazuh/ansible-filebeat/tasks/Debian.yml | 4 +--- roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml | 8 ++------ roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml | 4 +--- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml index 2cfcc77b..162ed42f 100644 --- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present - when: elasticsearch_install_java diff --git a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml index 9d0cd4b5..1fc5a1f8 100644 --- a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present - when: logstash_install_java diff --git a/roles/wazuh/ansible-filebeat/tasks/Debian.yml b/roles/wazuh/ansible-filebeat/tasks/Debian.yml index 32fab13e..226f145e 100644 --- a/roles/wazuh/ansible-filebeat/tasks/Debian.yml +++ b/roles/wazuh/ansible-filebeat/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index b11b846a..5fef8bad 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present - name: Debian/Ubuntu | Installing repository key @@ -47,11 +45,9 @@ - name: Debian/Ubuntu | Install OpenScap apt: + name: ['libopenscap8', 'xsltproc'] state: present when: wazuh_agent_config.openscap.disable == 'no' - pkg: - - libopenscap8 - - xsltproc tags: - init diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index 9905b238..94849f96 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present - name: Debian/Ubuntu | Installing Wazuh repository key From 7e284b8dd498b7d97b5d07f86999a3e2b44c2787 Mon Sep 17 00:00:00 2001 From: l Date: Mon, 1 Apr 2019 12:59:39 +0200 Subject: [PATCH 3/3] Using apt list at kibana --- roles/elastic-stack/ansible-kibana/tasks/Debian.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml index 733b222c..a7db7dee 100644 --- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml +++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml @@ -1,9 +1,7 @@ --- - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates apt: - pkg: - - apt-transport-https - - ca-certificates + name: ['apt-transport-https', 'ca-certificates'] state: present - name: Debian/Ubuntu | Add Elasticsearch GPG key