diff --git a/README.md b/README.md index 2926bb4..1a95b7f 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,10 @@ controlled by the following parameters: * ```es_work_dir``` - defaults to "/tmp/elasticsearch". * ```es_plugin_dir``` - defaults to "/usr/share/elasticsearch/plugins". +This role ships with sample scripts and templates located in the [files/scripts/](files/scripts) and [files/templates/](files/templates) directories, respectively. These variables are used with the Ansible [with_fileglob](http://docs.ansible.com/ansible/playbooks_loops.html#id4) loop. When setting the globs, be sure to use an absolute path. +* ```es_scripts_fileglob``` - defaults to `/files/scripts/`. +* ```es_templates_fileglob``` - defaults to `/files/templates/`. + ## Notes * The role assumes the user/group exists on the server. The elasticsearch packages create the default elasticsearch user. If this needs to be changed, ensure the user exists. diff --git a/tasks/elasticsearch-scripts.yml b/tasks/elasticsearch-scripts.yml index 546ed19..6d7d297 100644 --- a/tasks/elasticsearch-scripts.yml +++ b/tasks/elasticsearch-scripts.yml @@ -10,4 +10,5 @@ when: es_config['path.scripts'] is defined - name: Copy scripts to elasticsearch - copy: src=scripts dest={{ es_script_dir }} owner={{ es_user }} group={{ es_group }} \ No newline at end of file + copy: src={{ item }} dest={{ es_script_dir }} owner={{ es_user }} group={{ es_group }} + with_fileglob: es_scripts_fileglob | default("scripts") diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml index 1bcfd71..ba46fd8 100644 --- a/tasks/elasticsearch-templates.yml +++ b/tasks/elasticsearch-templates.yml @@ -1,7 +1,8 @@ --- - name: Copy templates to elasticsearch - copy: src=templates dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }} + copy: src={{ item }} dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }} + with_fileglob: es_templates_fileglob | default("templates") - set_fact: http_port=9200 @@ -17,4 +18,4 @@ - name: Install template(s) command: "curl -sL -XPUT http://localhost:{{http_port}}/_template/{{item}} -d @/etc/elasticsearch/templates/{{item}}.json" - with_items: resultstemplate.stdout_lines \ No newline at end of file + with_items: resultstemplate.stdout_lines