From 9ac640fa67efc3f9dad307846111b517b24b23a2 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Wed, 3 Aug 2022 09:21:03 -0400
Subject: [PATCH 1/2] Remove airgap-specific logic for ingest.geoip.downloader

---
 salt/elasticsearch/config.map.jinja | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index 71ff5b912..9a80ce30f 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -1,6 +1,5 @@
 {% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
 {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
-{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
 
 {% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
   {% do ESCONFIG.elasticsearch.config.xpack.security.authc.anonymous.update({'username': 'anonymous_user', 'roles': 'superuser', 'authz_exception': 'true'}) %}
@@ -34,10 +33,6 @@
     {% endif %}
 {% endif %}
 
-{% if ISAIRGAP %}
-  {% do ESCONFIG.elasticsearch.config.ingest.geoip.downloader.update({'enabled': false}) %}
-{% endif %}
-
 {# merge with the elasticsearch pillar #}
 {% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
 

From 8c694a7ca3f4b09f25f06e5d6eb2f2d3722bbf55 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Wed, 3 Aug 2022 09:21:40 -0400
Subject: [PATCH 2/2] Disable ingest.geoip.downloader by default

---
 salt/elasticsearch/defaults.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index 782f2ad93..ee2051d12 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -58,7 +58,7 @@ elasticsearch:
     ingest:
       geoip:
         downloader:
-          enabled: true
+          enabled: false
     logger:
       org:
         elasticsearch: