From b3cadea610aee1c16f9b4e166cd80461111fc4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 3 Mar 2022 09:04:24 -0300 Subject: [PATCH] Changes to packages prod repository --- roles/opensearch/wazuh-dashboard/defaults/main.yml | 12 ++++-------- roles/opensearch/wazuh-indexer/defaults/main.yml | 14 +++++--------- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 12 ++++-------- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 9 +++------ .../wazuh/ansible-wazuh-manager/defaults/main.yml | 9 +++------ roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml | 2 +- 6 files changed, 20 insertions(+), 38 deletions(-) diff --git a/roles/opensearch/wazuh-dashboard/defaults/main.yml b/roles/opensearch/wazuh-dashboard/defaults/main.yml index d3f8ed78..b69e8369 100644 --- a/roles/opensearch/wazuh-dashboard/defaults/main.yml +++ b/roles/opensearch/wazuh-dashboard/defaults/main.yml @@ -18,16 +18,12 @@ dashboard_version: "4.3.0" package_repos: yum: dashboard: - #baseurl: 'https://packages.wazuh.com/4.x/yum/' - baseurl: 'https://packages-dev.wazuh.com/pre-release/yum/' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + baseurl: 'https://packages.wazuh.com/4.x/yum/' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' apt: dashboard: - #baseurl: 'deb https://packages.wazuh.com/4.x/apt/ stable main' - baseurl: 'deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + baseurl: 'deb https://packages.wazuh.com/4.x/apt/ stable main' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' # API credentials wazuh_api_credentials: diff --git a/roles/opensearch/wazuh-indexer/defaults/main.yml b/roles/opensearch/wazuh-indexer/defaults/main.yml index 82e3ba5d..64f227ca 100644 --- a/roles/opensearch/wazuh-indexer/defaults/main.yml +++ b/roles/opensearch/wazuh-indexer/defaults/main.yml @@ -30,16 +30,12 @@ domain_name: wazuh.com package_repos: yum: indexer: - #baseurl: 'https://packages.wazuh.com/4.x/yum/' - baseurl: 'https://packages-dev.wazuh.com/pre-release/yum/' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + baseurl: 'https://packages.wazuh.com/4.x/yum/' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' apt: indexer: - #baseurl: 'deb https://packages.wazuh.com/4.x/apt/ stable main' - baseurl: 'deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + baseurl: 'deb https://packages.wazuh.com/4.x/apt/ stable main' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' openjdk: baseurl: 'deb http://deb.debian.org/debian stretch-backports main' @@ -60,7 +56,7 @@ indexer_http_port: 9200 certs_gen_tool_version: 4.3 # Url of certificates generator tool -certs_gen_tool_url: "https://packages-dev.wazuh.com/resources/{{ certs_gen_tool_version }}/install_functions/opendistro/wazuh-cert-tool.sh" +certs_gen_tool_url: "https://packages.wazuh.com/resources/{{ certs_gen_tool_version }}/install_functions/opendistro/wazuh-cert-tool.sh" indexer_admin_password: changeme dashboard_password: changeme diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index bbbbc494..0de5d2d0 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -6,8 +6,7 @@ wazuh_template_branch: v4.2.5 filebeat_output_indexer_hosts: - "localhost:9200" -#filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat -filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat +filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat filebeat_module_package_name: wazuh-filebeat-0.1.tar.gz filebeat_module_package_path: /tmp/ filebeat_module_destination: /usr/share/filebeat/module @@ -22,10 +21,7 @@ filebeat_ssl_dir: /etc/pki/filebeat local_certs_path: ./indexer/certificates filebeatrepo: - #apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' - apt: 'deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main' - #yum: 'https://packages.wazuh.com/4.x/yum/' - yum: 'https://packages-dev.wazuh.com/pre-release/yum/' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' + yum: 'https://packages.wazuh.com/4.x/yum/' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' \ No newline at end of file diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 63b1fbaf..8706a992 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -61,12 +61,9 @@ wazuh_winagent_package_name: wazuh-agent-4.3.0-1.msi wazuh_dir: "/var/ossec" wazuh_agent_repo: - #apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' - apt: 'deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main' - #yum: 'https://packages.wazuh.com/4.x/yum/' - yum: 'https://packages-dev.wazuh.com/pre-release/yum/' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' + yum: 'https://packages.wazuh.com/4.x/yum/' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' # This is deprecated, see: wazuh_agent_address diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 94eac58d..2e694ab5 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -38,12 +38,9 @@ wazuh_manager_sources_installation: wazuh_dir: "/var/ossec" wazuh_manager_repo: - #apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' - apt: 'deb https://packages-dev.wazuh.com/pre-release/apt/ unstable main' - #yum: 'https://packages.wazuh.com/4.x/yum/' - yum: 'https://packages-dev.wazuh.com/pre-release/yum/' - #gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' - gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' + apt: 'deb https://packages.wazuh.com/4.x/apt/ stable main' + yum: 'https://packages.wazuh.com/4.x/yum/' + gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index eec63592..717add8c 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -16,7 +16,7 @@ become: true shell: | set -o pipefail - curl -s https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - + curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - args: warn: false executable: /bin/bash