diff --git a/defaults/main.yml b/defaults/main.yml index 48f85c3..f264ae1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,7 @@ es_major_version: "5.x" es_version: "5.5.1" es_version_lock: false es_use_repository: true -es_templates_fileglob: "./files/templates/*" +es_templates_fileglob: "files/templates/*.json" 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 http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" diff --git a/handlers/main.yml b/handlers/main.yml index a7faa52..d44c24d 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -10,4 +10,4 @@ - es_restart_on_change - es_start_service - ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed)) - register: es_restarted \ No newline at end of file + register: es_restarted diff --git a/tasks/elasticsearch-template-copy.yml b/tasks/elasticsearch-template-copy.yml index 98a3e06..a6665c3 100644 --- a/tasks/elasticsearch-template-copy.yml +++ b/tasks/elasticsearch-template-copy.yml @@ -6,4 +6,4 @@ copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }} register: load_templates with_fileglob: - - "{{ es_templates_fileglob | default('') }}" \ No newline at end of file + - "{{ es_templates_fileglob | default('') }}" diff --git a/tasks/elasticsearch-template-insert.yml b/tasks/elasticsearch-template-insert.yml index de1d770..38cd9d7 100644 --- a/tasks/elasticsearch-template-insert.yml +++ b/tasks/elasticsearch-template-insert.yml @@ -33,4 +33,4 @@ when: es_start_service and es_enable_xpack and es_xpack_features is defined and "security" in es_xpack_features with_fileglob: - "{{ es_templates_fileglob | default('') }}" - run_once: True \ No newline at end of file + run_once: True