mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
Remove airgap-specific logic for ingest.geoip.downloader
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
{% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
|
{% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
|
||||||
{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
|
{% 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) %}
|
{% 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'}) %}
|
{% do ESCONFIG.elasticsearch.config.xpack.security.authc.anonymous.update({'username': 'anonymous_user', 'roles': 'superuser', 'authz_exception': 'true'}) %}
|
||||||
@@ -34,10 +33,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if ISAIRGAP %}
|
|
||||||
{% do ESCONFIG.elasticsearch.config.ingest.geoip.downloader.update({'enabled': false}) %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{# merge with the elasticsearch pillar #}
|
{# merge with the elasticsearch pillar #}
|
||||||
{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
|
{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user