afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better naming for parameter kid

Browse Source
This commit is contained in:
Jochen Schneider 2020-01-21 11:57:33 +01:00
parent 6361eacbf0
commit 50964bd0f8
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
View File

@ -11,7 +11,7 @@ elasticrepo:
apt: 'https://artifacts.elastic.co/packages/7.x/apt' apt: 'https://artifacts.elastic.co/packages/7.x/apt'
yum: 'https://artifacts.elastic.co/packages/7.x/yum' yum: 'https://artifacts.elastic.co/packages/7.x/yum'
gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4' key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
# Cluster Settings # Cluster Settings
single_node: true single_node: true

2
roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
View File

@ -31,7 +31,7 @@
- name: Debian/Ubuntu | Add Elasticsearch GPG key. - name: Debian/Ubuntu | Add Elasticsearch GPG key.
apt_key: apt_key:
url: "{{ elasticrepo.gpg }}" url: "{{ elasticrepo.gpg }}"
id: "{{ elasticrepo.kid }}" id: "{{ elasticrepo.key_id }}"
state: present state: present
- name: Debian/Ubuntu | Install Elastic repo - name: Debian/Ubuntu | Install Elastic repo

2
roles/elastic-stack/ansible-kibana/defaults/main.yml
View File

@ -13,7 +13,7 @@ elasticrepo:
apt: 'https://artifacts.elastic.co/packages/7.x/apt' apt: 'https://artifacts.elastic.co/packages/7.x/apt'
yum: 'https://artifacts.elastic.co/packages/7.x/yum' yum: 'https://artifacts.elastic.co/packages/7.x/yum'
gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4' key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
# API credentials # API credentials
wazuh_api_credentials: wazuh_api_credentials:

2
roles/elastic-stack/ansible-kibana/tasks/Debian.yml
View File

@ -11,7 +11,7 @@
- name: Debian/Ubuntu | Add Elasticsearch GPG key - name: Debian/Ubuntu | Add Elasticsearch GPG key
apt_key: apt_key:
url: "{{ elasticrepo.gpg }}" url: "{{ elasticrepo.gpg }}"
id: "{{ elasticrepo.kid }}" id: "{{ elasticrepo.key_id }}"
state: present state: present
- name: Debian/Ubuntu | Install Elastic repo - name: Debian/Ubuntu | Install Elastic repo

2
roles/wazuh/ansible-filebeat/defaults/main.yml
View File

@ -54,4 +54,4 @@ elasticrepo:
apt: 'https://artifacts.elastic.co/packages/7.x/apt' apt: 'https://artifacts.elastic.co/packages/7.x/apt'
yum: 'https://artifacts.elastic.co/packages/7.x/yum' yum: 'https://artifacts.elastic.co/packages/7.x/yum'
gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch' gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4' key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'

2
roles/wazuh/ansible-filebeat/tasks/Debian.yml
View File

@ -11,7 +11,7 @@
- name: Debian/Ubuntu | Add Elasticsearch apt key. - name: Debian/Ubuntu | Add Elasticsearch apt key.
apt_key: apt_key:
url: "{{ elasticrepo.gpg }}" url: "{{ elasticrepo.gpg }}"
id: "{{ elasticrepo.kid }}" id: "{{ elasticrepo.key_id }}"
state: present state: present
- name: Debian/Ubuntu | Add Filebeat repository. - name: Debian/Ubuntu | Add Filebeat repository.

2
roles/wazuh/ansible-wazuh-agent/defaults/main.yml
View File

@ -60,7 +60,7 @@ wazuh_agent_config:
apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main' apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
yum: 'https://packages.wazuh.com/3.x/yum/' yum: 'https://packages.wazuh.com/3.x/yum/'
gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
kid: '0DCFCA5547B19D2A6099506096B3EE5F29111145' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
active_response: active_response:
ar_disabled: 'no' ar_disabled: 'no'
ca_store: '/var/ossec/etc/wpk_root.pem' ca_store: '/var/ossec/etc/wpk_root.pem'

2
roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
View File

@ -25,7 +25,7 @@
- name: Debian/Ubuntu | Installing Wazuh repository key - name: Debian/Ubuntu | Installing Wazuh repository key
apt_key: apt_key:
url: "{{ wazuh_agent_config.repo.gpg }}" url: "{{ wazuh_agent_config.repo.gpg }}"
id: "{{ wazuhrepo.kid }}" id: "{{ wazuhrepo.key_id }}"
when: when:
- not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14) - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
- not wazuh_agent_sources_installation.enabled - not wazuh_agent_sources_installation.enabled

2
roles/wazuh/ansible-wazuh-manager/defaults/main.yml
View File

@ -52,7 +52,7 @@ wazuh_manager_config:
apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main' apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
yum: 'https://packages.wazuh.com/3.x/yum/' yum: 'https://packages.wazuh.com/3.x/yum/'
gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
kid: '0DCFCA5547B19D2A6099506096B3EE5F29111145' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
json_output: 'yes' json_output: 'yes'
alerts_log: 'yes' alerts_log: 'yes'
logall: 'no' logall: 'no'

2
roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
View File

@ -28,7 +28,7 @@
- name: Debian/Ubuntu | Installing Wazuh repository key - name: Debian/Ubuntu | Installing Wazuh repository key
apt_key: apt_key:
url: "{{ wazuh_manager_config.repo.gpg }}" url: "{{ wazuh_manager_config.repo.gpg }}"
id: "{{ wazuhrepo.kid }}" id: "{{ wazuhrepo.key_id }}"
when: when:
- not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14) - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
- not wazuh_manager_sources_installation.enabled or not wazuh_api_sources_installation.enabled - not wazuh_manager_sources_installation.enabled or not wazuh_api_sources_installation.enabled