From 2b60a217ab041433d11ba9d0d5660f38dccea9e0 Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Fri, 13 Jan 2017 11:59:31 +0000
Subject: [PATCH] Debian package url fixes for 5.x

---
 defaults/main.yml            |  6 +++---
 meta/main.yml.orig           | 30 ------------------------------
 templates/elasticsearch.repo |  6 ++----
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 meta/main.yml.orig

diff --git a/defaults/main.yml b/defaults/main.yml
index 84b4779..be4f132 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,9 +3,9 @@ es_major_version: "5.x"
 es_version: "5.1.1"
 es_version_lock: false
 es_use_repository: true
-es_apt_key: "https://packages.elasticsearch.org/GPG-KEY-elasticsearch"
-es_apt_url: "deb https://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
-es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
+es_apt_key: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+es_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main"
+es_apt_url_old: "deb https://artifacts.elastic.co/packages/{{ es_major_version }}/apt stable main"
 es_start_service: true
 es_java_install: true
 update_java: false
diff --git a/meta/main.yml.orig b/meta/main.yml.orig
deleted file mode 100644
index 27a03cf..0000000
--- a/meta/main.yml.orig
+++ /dev/null
@@ -1,30 +0,0 @@
----
-
-allow_duplicates: yes
-
-galaxy_info:
-  author: Robin Clarke, Jakob Reiter, Dale McDiarmid
-  description: Elasticsearch for Linux
-  company: "Elastic.co"
-  license: "license (Apache)"
-<<<<<<< HEAD
-  # Require 1.6 for apt deb install
-  min_ansible_version: 2.1.0
-=======
-  min_ansible_version: 2.0
->>>>>>> elastic/master
-  platforms:
-  - name: EL
-    versions:
-    - 6
-    - 7
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
-  categories:
-    - system
-
-dependencies: []
diff --git a/templates/elasticsearch.repo b/templates/elasticsearch.repo
index 83e1920..116ccf8 100644
--- a/templates/elasticsearch.repo
+++ b/templates/elasticsearch.repo
@@ -1,8 +1,6 @@
 [elasticsearch-{{ es_major_version }}]
 name=Elasticsearch repository for {{ es_major_version }} packages
-baseurl={% if es_version | version_compare('5.0', '>=') %}https://artifacts.elastic.co/packages/{{ es_major_version }}/yum{% else %}http://packages.elastic.co/elasticsearch/{{ es_major_version }}/centos{% endif %}
-
+baseurl=https://artifacts.elastic.co/packages/{{ es_major_version }}/yum
 gpgcheck=1
-gpgkey={% if es_version | version_compare('5.0', '>=') %}https://artifacts.elastic.co/GPG-KEY-elasticsearch{% else %}http://packages.elastic.co/GPG-KEY-elasticsearch{% endif %}
-
+gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
 enabled=1