Merge pull request #170 from koenpunt/patch-1

use https for package sources
This commit is contained in:
Jakob Reiter 2016-10-27 14:45:31 +02:00 committed by GitHub
commit 38354cb0bb
2 changed files with 10 additions and 6 deletions

View file

@ -3,8 +3,8 @@ es_major_version: "2.x"
es_version: "2.3.4" es_version: "2.3.4"
es_version_lock: false es_version_lock: false
es_use_repository: true es_use_repository: true
es_apt_key: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch" es_apt_key: "https://packages.elasticsearch.org/GPG-KEY-elasticsearch"
es_apt_url: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" es_apt_url: "deb https://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
es_start_service: true es_start_service: true
es_java_install: true es_java_install: true
update_java: false update_java: false
@ -27,4 +27,4 @@ es_xpack_features: []
#These are used for internal operations performed by ansible. #These are used for internal operations performed by ansible.
#They do not effect the current configuration #They do not effect the current configuration
es_api_host: "localhost" es_api_host: "localhost"
es_api_port: 9200 es_api_port: 9200

View file

@ -5,15 +5,19 @@
- set_fact: force_install=yes - set_fact: force_install=yes
when: es_allow_downgrades when: es_allow_downgrades
- name: Debian - Install apt-transport-https to support https APT downloads
apt: name=apt-transport-https state=present
when: es_use_repository
- name: Debian - Add Elasticsearch repository key - name: Debian - Add Elasticsearch repository key
apt_key: url="{{ es_apt_key }}" state=present apt_key: url="{{ es_apt_key }}" state=present
when: es_use_repository and es_apt_key when: es_use_repository and es_apt_key
- name: Debian - add elasticsearch repository - name: Debian - Add elasticsearch repository
apt_repository: repo="{{ es_apt_url }}" state=present apt_repository: repo="{{ es_apt_url }}" state=present
when: es_use_repository when: es_use_repository
- name: Debian - include versionlock - name: Debian - Include versionlock
include: elasticsearch-Debian-version-lock.yml include: elasticsearch-Debian-version-lock.yml
when: es_version_lock when: es_version_lock
@ -33,4 +37,4 @@
# ansible uri module requires httplib2 # ansible uri module requires httplib2
- name: python-httplib2 - name: python-httplib2
apt: name=python-httplib2 apt: name=python-httplib2