From 8b77f343e830db159d7b40d6ea95934ccec43e3c Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jan 06 2022 20:01:26 +0000
Subject: Update config for Elasticsearch 6.8.x


---

diff --git a/pillar/role/wikisearch.sls b/pillar/role/wikisearch.sls
index 891508a..3e5439b 100644
--- a/pillar/role/wikisearch.sls
+++ b/pillar/role/wikisearch.sls
@@ -7,38 +7,19 @@ apparmor:
       source: salt://profile/wikisearch/files/elasticsearch.apparmor
 
 elasticsearch:
+  pkg: elasticsearch6
   use_repo: False
   config:
     node.name: ${HOSTNAME}
     node.master: true
     node.data: true
-    index.number_of_shards: 1
-    index.number_of_replicas: 0
+    path.data: /var/lib/elasticsearch
+    path.logs: /var/log/elasticsearch
     network.host: 0.0.0.0
     http.port: 9200
     http.enabled: true
-    discovery.zen.minimum_master_nodes: 1
-    discovery.zen.ping.multicast.enabled: false
   sysconfig:
     # elasticsearch-formula rewrites the sysconfig file from scratch, therefore we have to copy all of its contents here
-    CONF_DIR: /etc/elasticsearch
-    CONF_FILE: /etc/elasticsearch/elasticsearch.yml
-    DATA_DIR: /var/lib
-    ES_CLUSTER_NAME: elasticsearch
-    ES_DIRECT_SIZE: ''
-    ES_HEAP_NEWSIZE: ''
-    ES_HEAP_SIZE: 256m
-    ES_HOME: /usr/share/elasticsearch
-    ES_HTTP_HOST: ''
-    ES_JAVA_OPTS: ''
-    ES_NODE_NAME: ''
-    ES_PLUGIN_DIR: /usr/share/java/elasticsearch/plugins
+    ES_PATH_CONF: /etc/elasticsearch
     ES_STARTUP_SLEEP_TIME: 5
-    ES_USER: elasticsearch
-    LOG_DIR: /var/log/elasticsearch
-    MAX_OPEN_FILES: 65534
-    MAX_LOCKED_MEMORY: unlimited
-    PID_DIR: /var/run/elasticsearch
-    RESTART_ON_UPGRADE: true
-    WORK_DIR: /tmp/elasticsearch
-  version: 1.7.6
+  version: 6.8.22