From a062a20bae26826927e6caf854d02804b03f6242 Mon Sep 17 00:00:00 2001 From: Fabrice Meyer Date: Sat, 21 Jan 2023 02:40:12 +0100 Subject: [PATCH 1/4] adding apt priority configuration --- defaults/main.yml | 1 + tasks/setup-Debian.yml | 8 ++++++++ templates/elasticsearch_policy.j2 | 3 +++ 3 files changed, 12 insertions(+) create mode 100644 templates/elasticsearch_policy.j2 diff --git a/defaults/main.yml b/defaults/main.yml index 132a301..3d30554 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,3 +13,4 @@ elasticsearch_heap_size_min: 1g elasticsearch_heap_size_max: 2g elasticsearch_extra_options: '' +elasticsearch_apt_priority: 100 \ No newline at end of file diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 9fde3c9..62b1ae2 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -16,3 +16,11 @@ repo: 'deb https://artifacts.elastic.co/packages/{{ elasticsearch_version }}/apt stable main' state: present update_cache: true + +- name: Lower apt priority from Elasticsearch repository (do not trust that repo for anything different) + template: + src: elasticsearch_policy.j2 + dest: /etc/apt/preferences.d/elasticsearch_policy_100 + owner: root + group: root + mode: 0644 \ No newline at end of file diff --git a/templates/elasticsearch_policy.j2 b/templates/elasticsearch_policy.j2 new file mode 100644 index 0000000..592f0c1 --- /dev/null +++ b/templates/elasticsearch_policy.j2 @@ -0,0 +1,3 @@ +Package: * +Pin: origin artifacts.elastic.co +Pin-Priority: {{ elasticsearch_apt_priority }} From 29fc1febff21fc8bfa8c9eda405d300c8db84e2b Mon Sep 17 00:00:00 2001 From: Fabrice Meyer Date: Wed, 3 May 2023 11:10:02 +0200 Subject: [PATCH 2/4] adding data and log path var to role --- defaults/main.yml | 2 ++ templates/elasticsearch.yml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3d30554..7f6ceb8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,6 +8,8 @@ elasticsearch_service_enabled: true elasticsearch_network_host: localhost elasticsearch_http_port: 9200 +elasticsearch_log: /var/log/elasticsearch +elasticsearch_data: /var/lib/elasticsearch elasticsearch_heap_size_min: 1g elasticsearch_heap_size_max: 2g diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2 index 85b3a9e..9988d08 100644 --- a/templates/elasticsearch.yml.j2 +++ b/templates/elasticsearch.yml.j2 @@ -31,11 +31,11 @@ # # Path to directory where to store the data (separate multiple locations by comma): # -path.data: /var/lib/elasticsearch +path.data: {{ elasticsearch_data }} # # Path to log files: # -path.logs: /var/log/elasticsearch +path.logs: {{ elasticsearch_log }} # # ----------------------------------- Memory ----------------------------------- # From c5b558facb39dbc7b1f19ada8bc1453f5552eb9c Mon Sep 17 00:00:00 2001 From: Fabrice Meyer Date: Wed, 3 May 2023 11:12:43 +0200 Subject: [PATCH 3/4] Revert "adding apt priority configuration" This reverts commit a062a20bae26826927e6caf854d02804b03f6242. --- defaults/main.yml | 1 - tasks/setup-Debian.yml | 8 -------- templates/elasticsearch_policy.j2 | 3 --- 3 files changed, 12 deletions(-) delete mode 100644 templates/elasticsearch_policy.j2 diff --git a/defaults/main.yml b/defaults/main.yml index 7f6ceb8..4ed9ee7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,4 +15,3 @@ elasticsearch_heap_size_min: 1g elasticsearch_heap_size_max: 2g elasticsearch_extra_options: '' -elasticsearch_apt_priority: 100 \ No newline at end of file diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 62b1ae2..9fde3c9 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -16,11 +16,3 @@ repo: 'deb https://artifacts.elastic.co/packages/{{ elasticsearch_version }}/apt stable main' state: present update_cache: true - -- name: Lower apt priority from Elasticsearch repository (do not trust that repo for anything different) - template: - src: elasticsearch_policy.j2 - dest: /etc/apt/preferences.d/elasticsearch_policy_100 - owner: root - group: root - mode: 0644 \ No newline at end of file diff --git a/templates/elasticsearch_policy.j2 b/templates/elasticsearch_policy.j2 deleted file mode 100644 index 592f0c1..0000000 --- a/templates/elasticsearch_policy.j2 +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: origin artifacts.elastic.co -Pin-Priority: {{ elasticsearch_apt_priority }} From 37dc6d9d7cd8b114787c5d9ff7b94838f2f2a299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20J=C3=A9go?= Date: Fri, 17 Jan 2025 11:32:27 +0100 Subject: [PATCH 4/4] add creation folder --- tasks/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index 1926fe7..e978f54 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -37,6 +37,18 @@ notify: restart elasticsearch when: elasticsearch_version[0] | int >= 7 +- name: Create Others Directories + become: yes + file: + path: "{{ item }}" + state: directory + owner: "elasticsearch" + group: "elasticsearch" + mode: "2750" + with_items: + - "{{ elasticsearch_log }}" + - "{{ elasticsearch_data }}" + - name: Force a restart if configuration has changed. meta: flush_handlers