From 8fab5ecbd173de96251b6d0805e4c2aff8401f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Garc=C3=ADa?= <garcapradossergi76@gmail.com>
Date: Wed, 3 Mar 2021 19:28:49 +0100
Subject: [PATCH] Change opendistro package url and gpg key

---
 .../opendistro-elasticsearch/defaults/main.yml       |  9 +++------
 .../opendistro-elasticsearch/tasks/RedHat.yml        | 12 +-----------
 roles/opendistro/opendistro-kibana/defaults/main.yml |  9 +++------
 roles/opendistro/opendistro-kibana/tasks/RedHat.yml  | 11 +----------
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
index 52db7353..b86dd656 100644
--- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
@@ -30,12 +30,9 @@ domain_name: wazuh.com
 package_repos:
   yum:
     opendistro:
-      baseurl: 'https://d3g5vo6xdbdb9a.cloudfront.net/yum/noarch/'
-      gpg: 'https://d3g5vo6xdbdb9a.cloudfront.net/GPG-KEY-opendistroforelasticsearch'
-    elasticsearch_oss:
-      baseurl: 'https://artifacts.elastic.co/packages/oss-7.x/yum'
-      gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
-
+      baseurl: 'https://packages.wazuh.com/4.x/yum/'
+      gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
+      
 opendistro_sec_plugin_conf_path: /usr/share/elasticsearch/plugins/opendistro_security/securityconfig
 opendistro_sec_plugin_tools_path: /usr/share/elasticsearch/plugins/opendistro_security/tools
 opendistro_conf_path: /etc/elasticsearch/
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
index 402cf3c3..08105af1 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
@@ -11,16 +11,6 @@
       gpgcheck: true
     changed_when: false
 
-  - name: RedHat/CentOS/Fedora | Add Elasticsearch-oss repo
-    yum_repository:
-      file: opendistro
-      name: elasticsearch_oss_repo
-      description: Elasticsearch-oss yum repository
-      baseurl: "{{ package_repos.yum.elasticsearch_oss.baseurl }}"
-      gpgkey: "{{ package_repos.yum.elasticsearch_oss.gpg }}"
-      gpgcheck: true
-    changed_when: false
-
   - name: RedHat/CentOS/Fedora | Install OpenJDK 11
     yum:
       name: java-11-openjdk-devel
@@ -50,4 +40,4 @@
       - unzip
 
   tags:
-  - install
\ No newline at end of file
+  - install
diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml
index 3caed1d0..a04db4e1 100644
--- a/roles/opendistro/opendistro-kibana/defaults/main.yml
+++ b/roles/opendistro/opendistro-kibana/defaults/main.yml
@@ -14,16 +14,13 @@ wazuh_version: 4.1.1
 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana
 
 # The OpenDistro package repository
-kibana_opendistro_version: -1.12.0-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts
+kibana_opendistro_version: 1.12.0-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts
 
 package_repos:
   yum:
     opendistro:
-      baseurl: 'https://d3g5vo6xdbdb9a.cloudfront.net/yum/noarch/'
-      gpg: 'https://d3g5vo6xdbdb9a.cloudfront.net/GPG-KEY-opendistroforelasticsearch'
-    elasticsearch_oss:
-      baseurl: 'https://artifacts.elastic.co/packages/oss-7.x/yum'
-      gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
+      baseurl: 'https://packages.wazuh.com/4.x/yum/'
+      gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
 
 
 # API credentials
diff --git a/roles/opendistro/opendistro-kibana/tasks/RedHat.yml b/roles/opendistro/opendistro-kibana/tasks/RedHat.yml
index d2dbc4ec..70b5b70a 100644
--- a/roles/opendistro/opendistro-kibana/tasks/RedHat.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/RedHat.yml
@@ -10,14 +10,5 @@
       gpgkey: "{{ package_repos.yum.opendistro.gpg }}"
       gpgcheck: true
 
-  - name: RedHat/CentOS/Fedora | Add Elasticsearch-oss repo
-    yum_repository:
-      file: opendistro
-      name: elasticsearch_oss_repo
-      description: Elasticsearch-oss yum repository
-      baseurl: "{{ package_repos.yum.elasticsearch_oss.baseurl }}"
-      gpgkey: "{{ package_repos.yum.elasticsearch_oss.gpg }}"
-      gpgcheck: true
-
   tags:
-    - install
\ No newline at end of file
+    - install